Modify handling of unique args.