Miscellaneous Changes

This pull request collects a few rather minor changes (w.r.t. the amount of code that's changed) and I didn't want to make a PR for each of them.

Some of them are innocuous, others might cause some discussion.

If certain commits turn out to be controversial, I can move them to separate pull requests.