Minor edits

These are a few changes that make `mlint` happier. I didn't want to flood inboxes by commenting on all of them. All the fixes here are non-critical.