Remove stray comma
Remove trailing whitespace
Merge pull request #1769 from twpayne/clean-ups

Trivial clean-ups