Reformatted some command line parsing opts.