misc simplification and clean up
A bit of a grab bag of minor improvements I noticed while working on other things. See commit messages for details.
A bit of a grab bag of minor improvements I noticed while working on other things. See commit messages for details.