Remove duplicate code for command args.
Remove duplicate code for command args.