Cleanup the argument handling