Refactored arg parsing from stoke back into args.