Fixed command line parsing one more

Hopefully this time covered all cases of pre-parsing, help printing
and parsing of tool dependant options