cmd_options: Fix #36 short option handling.