OpenSystemsDevelopment / qpdf

Handle optional choices in addition to required choices. Refactor the
way help options are added to completion to make it work with optional
help choices.