This is now mostly done (though there’s still some details to finish off).

This was actually way harder than anticipated, and the PRs were rather big, but the good news is I cleaned up a bunch of cruft so that other new things should be much easier to do in the future.