This is likely not complete, since on my system there are several more test and mypy failures, and it's not so clear which ones were introduced by my changes and which were already broken. Happy to amend when that's clearer.
follow-up on #2869
Checklist
[x] Checked that there aren't other open pull requests for
the same change.
[ ] Checked that all tests and type checking passes.
Summary of changes
This is likely not complete, since on my system there are several more test and mypy failures, and it's not so clear which ones were introduced by my changes and which were already broken. Happy to amend when that's clearer.
follow-up on #2869
Checklist