Fixes #569, Cosmetic changes

See commit messages.