Hrm.  These `optionNormalize`s are not always enough.  Revert in master until I can debug more thoroughly.
Hrm.  These `optionNormalize`s are not always enough.  Revert in master until
I can debug more thoroughly.

c-blake/cligen