Terse refactor

I noticed a few small unnecessaries, and coffee-fied them.  They're split into commits I saw as aesthetically distinct, in case you'd prefer to cherry-pick only some of the changes.