small cleanups aggregated
A few cleanups that I've found myself making repeatedly in WIP branches, figured it was worth pushing them to avoid cluttering diffs down the road.

- [ ] closes #xxxx
- [ ] tests added / passed
- [ ] passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
- [ ] whatsnew entry
