Simplify optional overloads
Merge pull request #688 from nwolverson/optionalvalue

Simplify optional overloads