Added better handling of command args with quotes in.