Opened PR #3609 as PR-D in the AST migration plan from Issue #2721. Though, the implementation is deliberately narrower than the issue plan called for in order to keep it reviewer-friendly. Would appreciate some adversarial 👀's on this, as we are nearing the fun/complex part of the migration. 🐕