Cosmetics#569

See commit messages.