diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
index 9c5c16f9..a44ca198 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
@@ -21,14 +21,10 @@
 
 package com.threerings.micasa.lobby;
 
-import com.threerings.micasa.lobby.LobbyMarshaller;
-import com.threerings.micasa.lobby.LobbyService;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-import java.util.List;
 
 /**
  * Dispatches requests to the {@link LobbyProvider}.
@@ -44,13 +40,14 @@ public class LobbyDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new LobbyMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
index 120416aa..735b251a 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
@@ -21,10 +21,10 @@
 
 package com.threerings.micasa.lobby;
 
-import com.threerings.micasa.lobby.LobbyService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 import java.util.List;
 
 /**
@@ -53,7 +53,7 @@ public class LobbyMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, GOT_CATEGORIES,
-                               new Object[] { arg1 }));
+                               new Object[] { arg1 }, transport));
         }
 
         @Override // from InvocationMarshaller
@@ -88,7 +88,7 @@ public class LobbyMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, GOT_LOBBIES,
-                               new Object[] { arg1 }));
+                               new Object[] { arg1 }, transport));
         }
 
         @Override // from InvocationMarshaller
diff --git a/src/java/com/threerings/micasa/lobby/LobbyProvider.java b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
index 2b5431ce..25cef2cb 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyProvider.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
@@ -21,12 +21,9 @@
 
 package com.threerings.micasa.lobby;
 
-import com.threerings.micasa.lobby.LobbyService;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-import java.util.List;
 
 /**
  * Defines the server-side of the {@link LobbyService}.
diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
index cd733fb7..b829a43f 100644
--- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
+++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
@@ -25,7 +25,7 @@ import com.threerings.micasa.simulator.client.SimulatorService;
 import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link SimulatorService} interface
diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
index 3b0d8238..438e4deb 100644
--- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
+++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
@@ -21,10 +21,8 @@
 
 package com.threerings.micasa.simulator.server;
 
-import com.threerings.micasa.simulator.client.SimulatorService;
 import com.threerings.micasa.simulator.data.SimulatorMarshaller;
 import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
@@ -44,13 +42,14 @@ public class SimulatorDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new SimulatorMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java b/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
index 4ccea733..11ddff94 100644
--- a/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
+++ b/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
@@ -25,7 +25,7 @@ import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.trick.client.TrickCardGameService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link TrickCardGameService} interface
diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
index 269fe34b..67370a2f 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
@@ -22,9 +22,7 @@
 package com.threerings.parlor.card.trick.server;
 
 import com.threerings.parlor.card.data.Card;
-import com.threerings.parlor.card.trick.client.TrickCardGameService;
 import com.threerings.parlor.card.trick.data.TrickCardGameMarshaller;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
@@ -44,13 +42,14 @@ public class TrickCardGameDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new TrickCardGameMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
index 23176177..6113647f 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
@@ -22,10 +22,7 @@
 package com.threerings.parlor.card.trick.server;
 
 import com.threerings.parlor.card.data.Card;
-import com.threerings.parlor.card.trick.client.TrickCardGameService;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 
 /**
diff --git a/src/java/com/threerings/parlor/data/ParlorMarshaller.java b/src/java/com/threerings/parlor/data/ParlorMarshaller.java
index 4f5db2fd..e32c2b18 100644
--- a/src/java/com/threerings/parlor/data/ParlorMarshaller.java
+++ b/src/java/com/threerings/parlor/data/ParlorMarshaller.java
@@ -27,6 +27,7 @@ import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 import com.threerings.util.Name;
 
 /**
@@ -55,7 +56,7 @@ public class ParlorMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, INVITE_RECEIVED,
-                               new Object[] { Integer.valueOf(arg1) }));
+                               new Object[] { Integer.valueOf(arg1) }, transport));
         }
 
         @Override // from InvocationMarshaller
diff --git a/src/java/com/threerings/parlor/data/TableMarshaller.java b/src/java/com/threerings/parlor/data/TableMarshaller.java
index 432d05e4..3d751d4f 100644
--- a/src/java/com/threerings/parlor/data/TableMarshaller.java
+++ b/src/java/com/threerings/parlor/data/TableMarshaller.java
@@ -22,12 +22,11 @@
 package com.threerings.parlor.data;
 
 import com.threerings.parlor.client.TableService;
-import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.game.data.GameConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link TableService} interface
diff --git a/src/java/com/threerings/parlor/server/ParlorDispatcher.java b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
index f3fe1ae7..834597d1 100644
--- a/src/java/com/threerings/parlor/server/ParlorDispatcher.java
+++ b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
@@ -24,7 +24,6 @@ package com.threerings.parlor.server;
 import com.threerings.parlor.client.ParlorService;
 import com.threerings.parlor.data.ParlorMarshaller;
 import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
@@ -46,13 +45,14 @@ public class ParlorDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new ParlorMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/parlor/server/ParlorProvider.java b/src/java/com/threerings/parlor/server/ParlorProvider.java
index eb22cba6..a03e46e1 100644
--- a/src/java/com/threerings/parlor/server/ParlorProvider.java
+++ b/src/java/com/threerings/parlor/server/ParlorProvider.java
@@ -23,7 +23,6 @@ package com.threerings.parlor.server;
 
 import com.threerings.parlor.client.ParlorService;
 import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
diff --git a/src/java/com/threerings/parlor/server/TableDispatcher.java b/src/java/com/threerings/parlor/server/TableDispatcher.java
index 6ee19eb8..d4cb0dc7 100644
--- a/src/java/com/threerings/parlor/server/TableDispatcher.java
+++ b/src/java/com/threerings/parlor/server/TableDispatcher.java
@@ -21,11 +21,9 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.parlor.client.TableService;
 import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.data.TableMarshaller;
 import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
@@ -46,13 +44,14 @@ public class TableDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new TableMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/parlor/server/TableProvider.java b/src/java/com/threerings/parlor/server/TableProvider.java
index a7f345bc..156f727f 100644
--- a/src/java/com/threerings/parlor/server/TableProvider.java
+++ b/src/java/com/threerings/parlor/server/TableProvider.java
@@ -21,10 +21,8 @@
 
 package com.threerings.parlor.server;
 
-import com.threerings.parlor.client.TableService;
 import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.game.data.GameConfig;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
diff --git a/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java b/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
index 3e0ec244..5fd8cfb8 100644
--- a/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
+++ b/src/java/com/threerings/parlor/tourney/data/TourneyMarshaller.java
@@ -25,7 +25,7 @@ import com.threerings.parlor.tourney.client.TourneyService;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link TourneyService} interface
diff --git a/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java b/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
index 6216fd75..1ca15cde 100644
--- a/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
+++ b/src/java/com/threerings/parlor/tourney/data/TourniesMarshaller.java
@@ -22,11 +22,10 @@
 package com.threerings.parlor.tourney.data;
 
 import com.threerings.parlor.tourney.client.TourniesService;
-import com.threerings.parlor.tourney.data.TourneyConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 
 /**
  * Provides the implementation of the {@link TourniesService} interface
diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
index a40425a0..301f5c17 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourneyDispatcher.java
@@ -21,9 +21,7 @@
 
 package com.threerings.parlor.tourney.server;
 
-import com.threerings.parlor.tourney.client.TourneyService;
 import com.threerings.parlor.tourney.data.TourneyMarshaller;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
@@ -44,13 +42,14 @@ public class TourneyDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new TourneyMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java b/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java
index 75d985ce..485d4632 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourneyProvider.java
@@ -21,8 +21,6 @@
 
 package com.threerings.parlor.tourney.server;
 
-import com.threerings.parlor.tourney.client.TourneyService;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
index c6b55d1b..4d8d2269 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourniesDispatcher.java
@@ -21,10 +21,8 @@
 
 package com.threerings.parlor.tourney.server;
 
-import com.threerings.parlor.tourney.client.TourniesService;
 import com.threerings.parlor.tourney.data.TourneyConfig;
 import com.threerings.parlor.tourney.data.TourniesMarshaller;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
@@ -45,13 +43,14 @@ public class TourniesDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new TourniesMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java b/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java
index 1cb95d65..7414913a 100644
--- a/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java
+++ b/src/java/com/threerings/parlor/tourney/server/TourniesProvider.java
@@ -21,9 +21,7 @@
 
 package com.threerings.parlor.tourney.server;
 
-import com.threerings.parlor.tourney.client.TourniesService;
 import com.threerings.parlor.tourney.data.TourneyConfig;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
diff --git a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
index 67e01adc..0cb6dfed 100644
--- a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
+++ b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
@@ -23,9 +23,8 @@ package com.threerings.puzzle.data;
 
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 import com.threerings.puzzle.client.PuzzleGameService;
-import com.threerings.puzzle.data.Board;
 
 /**
  * Provides the implementation of the {@link PuzzleGameService} interface
diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
index 9aacb501..661660c6 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
@@ -21,12 +21,10 @@
 
 package com.threerings.puzzle.server;
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-import com.threerings.puzzle.client.PuzzleGameService;
 import com.threerings.puzzle.data.Board;
 import com.threerings.puzzle.data.PuzzleGameMarshaller;
 
@@ -44,13 +42,14 @@ public class PuzzleGameDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new PuzzleGameMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
index 3fe878b6..674ab65e 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
@@ -21,11 +21,8 @@
 
 package com.threerings.puzzle.server;
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
-import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-import com.threerings.puzzle.client.PuzzleGameService;
 import com.threerings.puzzle.data.Board;
 
 /**
diff --git a/src/java/com/threerings/stage/data/StageSceneMarshaller.java b/src/java/com/threerings/stage/data/StageSceneMarshaller.java
index fdf52fe6..bd02cf2b 100644
--- a/src/java/com/threerings/stage/data/StageSceneMarshaller.java
+++ b/src/java/com/threerings/stage/data/StageSceneMarshaller.java
@@ -25,7 +25,7 @@ import com.threerings.miso.data.ObjectInfo;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 import com.threerings.stage.client.StageSceneService;
 
 /**
diff --git a/src/java/com/threerings/stage/server/StageSceneDispatcher.java b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
index 9f4bd5f6..6eec276c 100644
--- a/src/java/com/threerings/stage/server/StageSceneDispatcher.java
+++ b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
@@ -22,13 +22,11 @@
 package com.threerings.stage.server;
 
 import com.threerings.miso.data.ObjectInfo;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-import com.threerings.stage.client.StageSceneService;
 import com.threerings.stage.data.StageSceneMarshaller;
 
 /**
@@ -45,13 +43,14 @@ public class StageSceneDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new StageSceneMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/stage/server/StageSceneProvider.java b/src/java/com/threerings/stage/server/StageSceneProvider.java
index 3fbdc97c..743fbe51 100644
--- a/src/java/com/threerings/stage/server/StageSceneProvider.java
+++ b/src/java/com/threerings/stage/server/StageSceneProvider.java
@@ -22,12 +22,10 @@
 package com.threerings.stage.server;
 
 import com.threerings.miso.data.ObjectInfo;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
-import com.threerings.stage.client.StageSceneService;
 
 /**
  * Defines the server-side of the {@link StageSceneService}.
diff --git a/src/java/com/threerings/whirled/data/SceneMarshaller.java b/src/java/com/threerings/whirled/data/SceneMarshaller.java
index f5920edc..f56225bf 100644
--- a/src/java/com/threerings/whirled/data/SceneMarshaller.java
+++ b/src/java/com/threerings/whirled/data/SceneMarshaller.java
@@ -25,9 +25,8 @@ import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 import com.threerings.whirled.client.SceneService;
-import com.threerings.whirled.data.SceneModel;
-import com.threerings.whirled.data.SceneUpdate;
 
 /**
  * Provides the implementation of the {@link SceneService} interface
@@ -55,7 +54,7 @@ public class SceneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_REQUIRES_SERVER_SWITCH,
-                               new Object[] { arg1, arg2 }));
+                               new Object[] { arg1, arg2 }, transport));
         }
 
         /** The method id used to dispatch {@link #moveSucceeded}
@@ -68,7 +67,7 @@ public class SceneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED,
-                               new Object[] { Integer.valueOf(arg1), arg2 }));
+                               new Object[] { Integer.valueOf(arg1), arg2 }, transport));
         }
 
         /** The method id used to dispatch {@link #moveSucceededWithScene}
@@ -81,7 +80,7 @@ public class SceneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED_WITH_SCENE,
-                               new Object[] { Integer.valueOf(arg1), arg2, arg3 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport));
         }
 
         /** The method id used to dispatch {@link #moveSucceededWithUpdates}
@@ -94,7 +93,7 @@ public class SceneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
-                               new Object[] { Integer.valueOf(arg1), arg2, arg3 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport));
         }
 
         @Override // from InvocationMarshaller
diff --git a/src/java/com/threerings/whirled/server/SceneDispatcher.java b/src/java/com/threerings/whirled/server/SceneDispatcher.java
index 19bed551..caa95c3c 100644
--- a/src/java/com/threerings/whirled/server/SceneDispatcher.java
+++ b/src/java/com/threerings/whirled/server/SceneDispatcher.java
@@ -21,16 +21,12 @@
 
 package com.threerings.whirled.server;
 
-import com.threerings.crowd.data.PlaceConfig;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.SceneMarshaller;
-import com.threerings.whirled.data.SceneModel;
-import com.threerings.whirled.data.SceneUpdate;
 
 /**
  * Dispatches requests to the {@link SceneProvider}.
@@ -46,13 +42,14 @@ public class SceneDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new SceneMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/whirled/server/SceneProvider.java b/src/java/com/threerings/whirled/server/SceneProvider.java
index ef183cbe..d4b77f4c 100644
--- a/src/java/com/threerings/whirled/server/SceneProvider.java
+++ b/src/java/com/threerings/whirled/server/SceneProvider.java
@@ -21,14 +21,10 @@
 
 package com.threerings.whirled.server;
 
-import com.threerings.crowd.data.PlaceConfig;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.presents.server.InvocationProvider;
 import com.threerings.whirled.client.SceneService;
-import com.threerings.whirled.data.SceneModel;
-import com.threerings.whirled.data.SceneUpdate;
 
 /**
  * Defines the server-side of the {@link SceneService}.
diff --git a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
index 2285999b..02942afc 100644
--- a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
+++ b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
@@ -24,11 +24,10 @@ package com.threerings.whirled.spot.data;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.InvocationMarshaller;
-import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.data.SceneMarshaller;
 import com.threerings.whirled.spot.client.SpotService;
-import com.threerings.whirled.spot.data.Location;
 
 /**
  * Provides the implementation of the {@link SpotService} interface
diff --git a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
index f157f68f..689c0d5b 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
@@ -21,15 +21,12 @@
 
 package com.threerings.whirled.spot.server;
 
-import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
 import com.threerings.whirled.client.SceneService;
-import com.threerings.whirled.data.SceneMarshaller;
-import com.threerings.whirled.spot.client.SpotService;
 import com.threerings.whirled.spot.data.Location;
 import com.threerings.whirled.spot.data.SpotMarshaller;
 
@@ -47,13 +44,14 @@ public class SpotDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new SpotMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException
diff --git a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
index f5380e73..e3063670 100644
--- a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
+++ b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
@@ -25,10 +25,10 @@ import com.threerings.crowd.data.PlaceConfig;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
+import com.threerings.presents.net.Transport;
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.data.SceneUpdate;
 import com.threerings.whirled.zone.client.ZoneService;
-import com.threerings.whirled.zone.data.ZoneSummary;
 
 /**
  * Provides the implementation of the {@link ZoneService} interface
@@ -56,7 +56,7 @@ public class ZoneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED,
-                               new Object[] { Integer.valueOf(arg1), arg2, arg3 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3 }, transport));
         }
 
         /** The method id used to dispatch {@link #moveSucceededWithScene}
@@ -69,7 +69,7 @@ public class ZoneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED_WITH_SCENE,
-                               new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }, transport));
         }
 
         /** The method id used to dispatch {@link #moveSucceededWithUpdates}
@@ -82,7 +82,7 @@ public class ZoneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
-                               new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }, transport));
         }
 
         @Override // from InvocationMarshaller
diff --git a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
index 2a5f82ab..55de6574 100644
--- a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
+++ b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
@@ -21,17 +21,12 @@
 
 package com.threerings.whirled.zone.server;
 
-import com.threerings.crowd.data.PlaceConfig;
-import com.threerings.presents.client.Client;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.server.InvocationDispatcher;
 import com.threerings.presents.server.InvocationException;
-import com.threerings.whirled.data.SceneModel;
-import com.threerings.whirled.data.SceneUpdate;
 import com.threerings.whirled.zone.client.ZoneService;
 import com.threerings.whirled.zone.data.ZoneMarshaller;
-import com.threerings.whirled.zone.data.ZoneSummary;
 
 /**
  * Dispatches requests to the {@link ZoneProvider}.
@@ -47,13 +42,14 @@ public class ZoneDispatcher extends InvocationDispatcher
         this.provider = provider;
     }
 
-    // from InvocationDispatcher
+    @Override // documentation inherited
     public InvocationMarshaller createMarshaller ()
     {
         return new ZoneMarshaller();
     }
 
-    @SuppressWarnings("unchecked") // from InvocationDispatcher
+    @SuppressWarnings("unchecked")
+    @Override // documentation inherited
     public void dispatchRequest (
         ClientObject source, int methodId, Object[] args)
         throws InvocationException