diff --git a/src/java/com/threerings/presents/tools/InvocationTask.java b/src/java/com/threerings/presents/tools/InvocationTask.java
index dbddba38c..7b2712aba 100644
--- a/src/java/com/threerings/presents/tools/InvocationTask.java
+++ b/src/java/com/threerings/presents/tools/InvocationTask.java
@@ -129,16 +129,16 @@ public abstract class InvocationTask extends Task
             }
         }
 
-        public String getArgList (boolean providerMode)
+        public String getArgList (boolean skipFirst)
         {
             StringBuffer buf = new StringBuffer();
             Class[] args = method.getParameterTypes();
-            for (int ii = providerMode ? 1 : 0; ii < args.length; ii++) {
+            for (int ii = skipFirst ? 1 : 0; ii < args.length; ii++) {
                 if (buf.length() > 0) {
                     buf.append(", ");
                 }
                 buf.append(GenUtil.simpleName(args[ii]));
-                buf.append(" arg").append(providerMode ? ii : ii+1);
+                buf.append(" arg").append(skipFirst ? ii : ii+1);
             }
             return buf.toString();
         }
@@ -156,9 +156,9 @@ public abstract class InvocationTask extends Task
             return buf.toString();
         }
 
-        public boolean hasArgs ()
+        public boolean hasArgs (boolean skipFirst)
         {
-            return (method.getParameterTypes().length > 1);
+            return (method.getParameterTypes().length > (skipFirst ? 1 : 0));
         }
 
         public int compareTo (Object other)
diff --git a/src/java/com/threerings/presents/tools/dispatcher.tmpl b/src/java/com/threerings/presents/tools/dispatcher.tmpl
index b4c8d796a..5b236e3fc 100644
--- a/src/java/com/threerings/presents/tools/dispatcher.tmpl
+++ b/src/java/com/threerings/presents/tools/dispatcher.tmpl
@@ -33,7 +33,7 @@ public class ${name}Dispatcher extends InvocationDispatcher
 #foreach ($m in $methods)
         case ${name}Marshaller.$m.code:
             ((${name}Provider)provider).${m.method.name}(
-                source#if ($m.hasArgs()),
+                source#if ($m.hasArgs(true)),
 #end
                 $m.getUnwrappedArgList(false)
             );
diff --git a/src/java/com/threerings/presents/tools/provider.tmpl b/src/java/com/threerings/presents/tools/provider.tmpl
index 9d950bd1c..c67924297 100644
--- a/src/java/com/threerings/presents/tools/provider.tmpl
+++ b/src/java/com/threerings/presents/tools/provider.tmpl
@@ -16,7 +16,7 @@ public interface ${name}Provider extends InvocationProvider
     /**
      * Handles a {@link ${name}Service#$m.method.name} request.
      */
-    public void $m.method.name (ClientObject caller#if ($m.hasArgs()), #end$m.getArgList(true))#if ($m.listenerArgs.size() > 0)
+    public void $m.method.name (ClientObject caller#if ($m.hasArgs(true)), #end$m.getArgList(true))#if ($m.listenerArgs.size() > 0)
 
         throws InvocationException#end;
 #end
diff --git a/src/java/com/threerings/presents/tools/sender.tmpl b/src/java/com/threerings/presents/tools/sender.tmpl
index 45fad0404..5db04e034 100644
--- a/src/java/com/threerings/presents/tools/sender.tmpl
+++ b/src/java/com/threerings/presents/tools/sender.tmpl
@@ -16,7 +16,7 @@ public class ${name}Sender extends InvocationSender
      * ${name}Receiver#$m.method.name} on a client.
      */
     public static void $m.senderMethodName (
-        ClientObject target#if ($m.hasArgs()), #end$m.getArgList(false))
+        ClientObject target#if ($m.hasArgs(false)), #end$m.getArgList(false))
     {
         sendNotification(
             target, ${name}Decoder.RECEIVER_CODE, ${name}Decoder.$m.code,