Misc style changes suggested by upstream in pull request