Commits to fix hygiene

Hi Ravi,

Here are four commits you might like. Please use "git fetch" to fetch them locally, and then "gitk --all" to look at them and see how the "hygiene-fixes" branch relates to the "master" branch.

If you like what you see, run "git merge --ff-only origin/hygiene-fixes" and look at the result with "gitk --all". Then use "git push" to advance the remote master branch to the same place as your local master branch.

Cheers,
Keith