A few tweaks, typo corrections, and random cleanups

No grand plan here, just things I ran into and unconsciously fixed in the course of doing other things.

I've left them in separate commits for ease of review, lmk and I can squash+force-push.