Correct small nits reported by Rob Hooft.
22 files changed