Allow infinitely many arguments to  and
Fix merge conflict