Bunch of changes from another style guide meeting.