Small cosmetic tweaks.

See commit messages.