Closes #
<!-- Bug fix: the first commit holds only red tests, the fix is a later commit on this same PR. Say which is which. -->-[ ] `Closes #N` is above
- [ ] Bug: red-tests commit first, fix commit second, same PR
- [ ] `cargo test` passes on the last commit (say what you ran)
- [ ] No formatting-only or unrelated changes