Minor tidying.
Merge pull request #195 from csmith/master

Minor tidying.