Refined parser for command line options