Here's a revised patch which drops adding the argument to Emacs itself;
it only adds an argument to emacsclient.