Some small, mostly stylistic changes to the pull request we merged.