Incorporate some suggestions by Tait Stevens.
4 files changed