Address PR feedback

Work through exactly one pull request without creating a second review conversation. With the exact automatic-merge qualifier, merge an ordinary PR only after the same exact-head readiness contract passes.

Invariants