More style improvements

As in the previous commit, these changes bring more of the code into
standards.
Merge branch 'more-style'