Fix some comments from #357 that got missed.
Merge pull request #362 from peternewman/trivial-fixes

Fix some comments from #357 that got missed.