Apply fixup-features to our codebase, revising it as needed

The WIP here is currently !1068 (closed), though I expect to have to change it significantly.

This is a prerequisite for #711.