Simplify some optional logic.
Merge pull request #113 from csmith/master

Simplify some optional logic.