Fix some coding style issues.

This patch series fixes some style issues originally pointed out in pull
request #2379 but which are also present in the master branch.