Default style changes

See commit messages for details.