This one took some shuffling to rebase, but I think it's still a net win. Mostly pretty minor stuff.