Do not assume invalid options are of boolean type
Merge pull request #2311 from alco/option-parser-fixes

Do not assume invalid options are of boolean type