[PATCH] cli: command line option parser cleanup

[David Bremner]

Jani Nikula <jani at nikula.org> writes:

> Reduce the indentation for clarity. No functional changes.
>

pushed, 

d