diff --git a/src/java/com/threerings/admin/client/AdminService.java b/src/java/com/threerings/admin/client/AdminService.java
index 98479f8b5..219047299 100644
--- a/src/java/com/threerings/admin/client/AdminService.java
+++ b/src/java/com/threerings/admin/client/AdminService.java
@@ -1,5 +1,5 @@
 //
-// $Id: AdminService.java,v 1.4 2004/08/27 02:12:23 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/admin/data/AdminMarshaller.java b/src/java/com/threerings/admin/data/AdminMarshaller.java
index 08d1e1ba3..5a0dfa7a1 100644
--- a/src/java/com/threerings/admin/data/AdminMarshaller.java
+++ b/src/java/com/threerings/admin/data/AdminMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ public class AdminMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
diff --git a/src/java/com/threerings/admin/server/AdminDispatcher.java b/src/java/com/threerings/admin/server/AdminDispatcher.java
index d09168d26..a5d6a31cd 100644
--- a/src/java/com/threerings/admin/server/AdminDispatcher.java
+++ b/src/java/com/threerings/admin/server/AdminDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ public class AdminDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/cast/builder/BuilderModel.java b/src/java/com/threerings/cast/builder/BuilderModel.java
index 558622f6d..cee526384 100644
--- a/src/java/com/threerings/cast/builder/BuilderModel.java
+++ b/src/java/com/threerings/cast/builder/BuilderModel.java
@@ -1,5 +1,5 @@
 //
-// $Id: BuilderModel.java,v 1.6 2004/08/27 02:12:26 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -107,7 +107,7 @@ public class BuilderModel
      */
     public void setSelectedComponent (ComponentClass cclass, int cid)
     {
-        _selected.put(cclass, new Integer(cid));
+        _selected.put(cclass, Integer.valueOf(cid));
         notifyListeners(BuilderModelListener.COMPONENT_CHANGED);
     }
 
diff --git a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
index 0d9d37f7d..51a163649 100644
--- a/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
+++ b/src/java/com/threerings/cast/bundle/tools/ComponentBundlerTask.java
@@ -504,7 +504,7 @@ public class ComponentBundlerTask extends Task
             Tuple key = new Tuple(cclass, cname);
             Integer cid = (Integer)get(key);
             if (cid == null) {
-                cid = new Integer(++_nextCID);
+                cid = Integer.valueOf(++_nextCID);
                 put(key, cid);
             }
             return cid.intValue();
diff --git a/src/java/com/threerings/crowd/chat/client/SpeakService.java b/src/java/com/threerings/crowd/chat/client/SpeakService.java
index dc9d31e04..f3bdbf726 100644
--- a/src/java/com/threerings/crowd/chat/client/SpeakService.java
+++ b/src/java/com/threerings/crowd/chat/client/SpeakService.java
@@ -1,5 +1,5 @@
 //
-// $Id: SpeakService.java,v 1.3 2004/08/27 02:12:30 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
index 4d11f9233..3e82feca4 100644
--- a/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
+++ b/src/java/com/threerings/crowd/chat/data/ChatMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -52,7 +52,7 @@ public class ChatMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, TELL_SUCCEEDED,
-                               new Object[] { new Long(arg1), arg2 }));
+                               new Object[] { Long.valueOf(arg1), arg2 }));
         }
 
         // documentation inherited
@@ -66,6 +66,7 @@ public class ChatMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
diff --git a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
index 71a2dc060..a27fcd139 100644
--- a/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
+++ b/src/java/com/threerings/crowd/chat/data/SpeakMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ public class SpeakMarshaller extends InvocationMarshaller
     public void speak (Client arg1, String arg2, byte arg3)
     {
         sendRequest(arg1, SPEAK, new Object[] {
-            arg2, new Byte(arg3)
+            arg2, Byte.valueOf(arg3)
         });
     }
 
diff --git a/src/java/com/threerings/crowd/chat/data/SpeakObject.java b/src/java/com/threerings/crowd/chat/data/SpeakObject.java
index e882b2bf1..2f0e03d63 100644
--- a/src/java/com/threerings/crowd/chat/data/SpeakObject.java
+++ b/src/java/com/threerings/crowd/chat/data/SpeakObject.java
@@ -1,5 +1,5 @@
 //
-// $Id: SpeakObject.java,v 1.4 2004/08/27 02:12:31 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
index 4777c49f4..53dd40a83 100644
--- a/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
+++ b/src/java/com/threerings/crowd/chat/server/ChatDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -80,6 +80,7 @@ public class ChatDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
index 2c1abd227..a68607624 100644
--- a/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
+++ b/src/java/com/threerings/crowd/chat/server/SpeakDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ public class SpeakDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/crowd/client/BodyService.java b/src/java/com/threerings/crowd/client/BodyService.java
index 5c3f2e1fd..ff123719e 100644
--- a/src/java/com/threerings/crowd/client/BodyService.java
+++ b/src/java/com/threerings/crowd/client/BodyService.java
@@ -1,5 +1,5 @@
 //
-// $Id: BodyService.java,v 1.2 2004/08/27 02:12:32 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/crowd/client/LocationDecoder.java b/src/java/com/threerings/crowd/client/LocationDecoder.java
index 2051cf17e..6ce8e64fb 100644
--- a/src/java/com/threerings/crowd/client/LocationDecoder.java
+++ b/src/java/com/threerings/crowd/client/LocationDecoder.java
@@ -63,6 +63,7 @@ public class LocationDecoder extends InvocationDecoder
 
         default:
             super.dispatchNotification(methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/crowd/client/LocationReceiver.java b/src/java/com/threerings/crowd/client/LocationReceiver.java
index 8cf0f5153..307608094 100644
--- a/src/java/com/threerings/crowd/client/LocationReceiver.java
+++ b/src/java/com/threerings/crowd/client/LocationReceiver.java
@@ -1,5 +1,5 @@
 //
-// $Id: LocationReceiver.java,v 1.2 2004/08/27 02:12:33 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/crowd/client/OccupantDirector.java b/src/java/com/threerings/crowd/client/OccupantDirector.java
index 1cdb10a23..eb26471f7 100644
--- a/src/java/com/threerings/crowd/client/OccupantDirector.java
+++ b/src/java/com/threerings/crowd/client/OccupantDirector.java
@@ -98,7 +98,7 @@ public class OccupantDirector extends BasicDirector
     {
         // make sure we're somewhere
         return (_place == null) ? null :
-            (OccupantInfo)_place.occupantInfo.get(new Integer(bodyOid));
+            (OccupantInfo)_place.occupantInfo.get(Integer.valueOf(bodyOid));
     }
 
     /**
diff --git a/src/java/com/threerings/crowd/data/BodyMarshaller.java b/src/java/com/threerings/crowd/data/BodyMarshaller.java
index 900012f46..1d374f24a 100644
--- a/src/java/com/threerings/crowd/data/BodyMarshaller.java
+++ b/src/java/com/threerings/crowd/data/BodyMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ public class BodyMarshaller extends InvocationMarshaller
     public void setIdle (Client arg1, boolean arg2)
     {
         sendRequest(arg1, SET_IDLE, new Object[] {
-            new Boolean(arg2)
+            Boolean.valueOf(arg2)
         });
     }
 
diff --git a/src/java/com/threerings/crowd/data/BodyObject.java b/src/java/com/threerings/crowd/data/BodyObject.java
index 90997f78e..c0a8aef81 100644
--- a/src/java/com/threerings/crowd/data/BodyObject.java
+++ b/src/java/com/threerings/crowd/data/BodyObject.java
@@ -175,7 +175,7 @@ public class BodyObject extends ClientObject
     {
         int ovalue = this.location;
         requestAttributeChange(
-            LOCATION, new Integer(value), new Integer(ovalue));
+            LOCATION, Integer.valueOf(value), Integer.valueOf(ovalue));
         this.location = value;
     }
 
@@ -191,7 +191,7 @@ public class BodyObject extends ClientObject
     {
         byte ovalue = this.status;
         requestAttributeChange(
-            STATUS, new Byte(value), new Byte(ovalue));
+            STATUS, Byte.valueOf(value), Byte.valueOf(ovalue));
         this.status = value;
     }
 
diff --git a/src/java/com/threerings/crowd/data/LocationMarshaller.java b/src/java/com/threerings/crowd/data/LocationMarshaller.java
index bd94dd1ca..08d6aff52 100644
--- a/src/java/com/threerings/crowd/data/LocationMarshaller.java
+++ b/src/java/com/threerings/crowd/data/LocationMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -65,6 +65,7 @@ public class LocationMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
@@ -89,7 +90,7 @@ public class LocationMarshaller extends InvocationMarshaller
         LocationMarshaller.MoveMarshaller listener3 = new LocationMarshaller.MoveMarshaller();
         listener3.listener = arg3;
         sendRequest(arg1, MOVE_TO, new Object[] {
-            new Integer(arg2), listener3
+            Integer.valueOf(arg2), listener3
         });
     }
 
diff --git a/src/java/com/threerings/crowd/data/OccupantInfo.java b/src/java/com/threerings/crowd/data/OccupantInfo.java
index a1b4af0bc..18308c721 100644
--- a/src/java/com/threerings/crowd/data/OccupantInfo.java
+++ b/src/java/com/threerings/crowd/data/OccupantInfo.java
@@ -74,7 +74,7 @@ public class OccupantInfo extends SimpleStreamableObject
      */
     public OccupantInfo (BodyObject body)
     {
-        bodyOid = new Integer(body.getOid());
+        bodyOid = Integer.valueOf(body.getOid());
         username = body.getVisibleName();
         status = body.status;
     }
diff --git a/src/java/com/threerings/crowd/server/BodyDispatcher.java b/src/java/com/threerings/crowd/server/BodyDispatcher.java
index eb3ead05c..3b5f49fd5 100644
--- a/src/java/com/threerings/crowd/server/BodyDispatcher.java
+++ b/src/java/com/threerings/crowd/server/BodyDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ public class BodyDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/crowd/server/LocationDispatcher.java b/src/java/com/threerings/crowd/server/LocationDispatcher.java
index 7c07d0313..cedf5e90f 100644
--- a/src/java/com/threerings/crowd/server/LocationDispatcher.java
+++ b/src/java/com/threerings/crowd/server/LocationDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -71,6 +71,7 @@ public class LocationDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/crowd/server/LocationProvider.java b/src/java/com/threerings/crowd/server/LocationProvider.java
index 7a28223b2..b2cfa9248 100644
--- a/src/java/com/threerings/crowd/server/LocationProvider.java
+++ b/src/java/com/threerings/crowd/server/LocationProvider.java
@@ -194,7 +194,7 @@ public class LocationProvider
         try {
             PlaceObject pold = (PlaceObject)_omgr.getObject(oldloc);
             if (pold != null) {
-                Integer key = new Integer(bodoid);
+                Integer key = Integer.valueOf(bodoid);
                 pold.startTransaction();
                 try {
                     // remove their occupant info (which is keyed on oid)
diff --git a/src/java/com/threerings/crowd/server/LocationSender.java b/src/java/com/threerings/crowd/server/LocationSender.java
index e4f3cd5cf..cc6da6428 100644
--- a/src/java/com/threerings/crowd/server/LocationSender.java
+++ b/src/java/com/threerings/crowd/server/LocationSender.java
@@ -41,7 +41,7 @@ public class LocationSender extends InvocationSender
     {
         sendNotification(
             target, LocationDecoder.RECEIVER_CODE, LocationDecoder.FORCED_MOVE,
-            new Object[] { new Integer(arg1) });
+            new Object[] { Integer.valueOf(arg1) });
     }
 
 }
diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/java/com/threerings/crowd/server/PlaceManager.java
index c802c5689..44e516d58 100644
--- a/src/java/com/threerings/crowd/server/PlaceManager.java
+++ b/src/java/com/threerings/crowd/server/PlaceManager.java
@@ -446,7 +446,7 @@ public class PlaceManager
         // if their occupant info hasn't been removed (which may be the
         // case if they logged off rather than left via a MoveTo request),
         // we need to get it on out of here
-        Integer key = new Integer(bodyOid);
+        Integer key = Integer.valueOf(bodyOid);
         if (_plobj.occupantInfo.containsKey(key)) {
             _plobj.removeFromOccupantInfo(key);
         }
diff --git a/src/java/com/threerings/io/BasicStreamers.java b/src/java/com/threerings/io/BasicStreamers.java
index 101b5e32e..d50aebdbf 100644
--- a/src/java/com/threerings/io/BasicStreamers.java
+++ b/src/java/com/threerings/io/BasicStreamers.java
@@ -81,7 +81,7 @@ public class BasicStreamers
         public Object createObject (ObjectInputStream in)
             throws IOException
         {
-            return new Boolean(in.readBoolean());
+            return Boolean.valueOf(in.readBoolean());
         }
 
         // documentation inherited
@@ -108,7 +108,7 @@ public class BasicStreamers
         public Object createObject (ObjectInputStream in)
             throws IOException
         {
-            return new Byte(in.readByte());
+            return Byte.valueOf(in.readByte());
         }
 
         // documentation inherited
@@ -135,7 +135,7 @@ public class BasicStreamers
         public Object createObject (ObjectInputStream in)
             throws IOException
         {
-            return new Short(in.readShort());
+            return Short.valueOf(in.readShort());
         }
 
         // documentation inherited
@@ -162,7 +162,7 @@ public class BasicStreamers
         public Object createObject (ObjectInputStream in)
             throws IOException
         {
-            return new Character(in.readChar());
+            return Character.valueOf(in.readChar());
         }
 
         // documentation inherited
@@ -189,7 +189,7 @@ public class BasicStreamers
         public Object createObject (ObjectInputStream in)
             throws IOException
         {
-            return new Integer(in.readInt());
+            return Integer.valueOf(in.readInt());
         }
 
         // documentation inherited
@@ -216,7 +216,7 @@ public class BasicStreamers
         public Object createObject (ObjectInputStream in)
             throws IOException
         {
-            return new Long(in.readLong());
+            return Long.valueOf(in.readLong());
         }
 
         // documentation inherited
@@ -243,7 +243,7 @@ public class BasicStreamers
         public Object createObject (ObjectInputStream in)
             throws IOException
         {
-            return new Float(in.readFloat());
+            return Float.valueOf(in.readFloat());
         }
 
         // documentation inherited
@@ -270,7 +270,7 @@ public class BasicStreamers
         public Object createObject (ObjectInputStream in)
             throws IOException
         {
-            return new Double(in.readDouble());
+            return Double.valueOf(in.readDouble());
         }
 
         // documentation inherited
diff --git a/src/java/com/threerings/io/SimpleStreamableObject.java b/src/java/com/threerings/io/SimpleStreamableObject.java
index e57a6814c..458a19ee3 100644
--- a/src/java/com/threerings/io/SimpleStreamableObject.java
+++ b/src/java/com/threerings/io/SimpleStreamableObject.java
@@ -1,5 +1,5 @@
 //
-// $Id: SimpleStreamableObject.java,v 1.2 2004/08/27 02:12:36 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/io/TrackedStreamableObject.java b/src/java/com/threerings/io/TrackedStreamableObject.java
index f66443f5a..e3f43c3c0 100644
--- a/src/java/com/threerings/io/TrackedStreamableObject.java
+++ b/src/java/com/threerings/io/TrackedStreamableObject.java
@@ -1,5 +1,5 @@
 //
-// $Id: TrackedStreamableObject.java,v 1.2 2004/08/27 02:12:36 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/jme/tile/TileFringer.java b/src/java/com/threerings/jme/tile/TileFringer.java
index 2d5381339..6ddb7521d 100644
--- a/src/java/com/threerings/jme/tile/TileFringer.java
+++ b/src/java/com/threerings/jme/tile/TileFringer.java
@@ -260,7 +260,7 @@ public class TileFringer
             } else if (weebits != 0) {
                 index = BITS_TO_INDEX[weebits];
                 if (index != -1) {
-                    indexes.add(new Integer(index));
+                    indexes.add(Integer.valueOf(index));
                 }
                 weebits = 0;
             }
@@ -268,7 +268,7 @@ public class TileFringer
         if (weebits != 0) {
             index = BITS_TO_INDEX[weebits];
             if (index != -1) {
-                indexes.add(new Integer(index));
+                indexes.add(Integer.valueOf(index));
             }
         }
 
diff --git a/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java b/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
index b2d93a188..c0425ddc1 100644
--- a/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
+++ b/src/java/com/threerings/media/tile/tools/MapFileTileSetIDBroker.java
@@ -1,5 +1,5 @@
 //
-// $Id: MapFileTileSetIDBroker.java,v 1.8 2004/08/27 02:12:44 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -93,7 +93,7 @@ public class MapFileTileSetIDBroker implements TileSetIDBroker
     {
         Integer tsid = (Integer)_map.get(tileSetName);
         if (tsid == null) {
-            tsid = new Integer(++_nextTileSetID);
+            tsid = Integer.valueOf(++_nextTileSetID);
             _map.put(tileSetName, tsid);
         }
         return tsid.intValue();
diff --git a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
index 3a81debb4..4f76e126a 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -72,6 +72,7 @@ public class LobbyDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
index bb86f2652..c8f10fdb8 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -65,6 +65,7 @@ public class LobbyMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
@@ -97,6 +98,7 @@ public class LobbyMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
diff --git a/src/java/com/threerings/micasa/lobby/LobbyProvider.java b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
index c4a4a9b3e..c219e1bba 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyProvider.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
diff --git a/src/java/com/threerings/micasa/lobby/LobbyService.java b/src/java/com/threerings/micasa/lobby/LobbyService.java
index c2e6b65a1..9475cacfb 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyService.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyService.java
@@ -1,5 +1,5 @@
 //
-// $Id: LobbyService.java,v 1.5 2004/08/27 02:12:50 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
index 57f9eda24..43fbee69b 100644
--- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
+++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ public class SimulatorMarshaller extends InvocationMarshaller
     public void createGame (Client arg1, GameConfig arg2, String arg3, int arg4)
     {
         sendRequest(arg1, CREATE_GAME, new Object[] {
-            arg2, arg3, new Integer(arg4)
+            arg2, arg3, Integer.valueOf(arg4)
         });
     }
 
diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
index d3c893d67..2609a017e 100644
--- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
+++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -65,6 +65,7 @@ public class SimulatorDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/miso/tile/AutoFringer.java b/src/java/com/threerings/miso/tile/AutoFringer.java
index 06ddb5a4d..08ee9a28e 100644
--- a/src/java/com/threerings/miso/tile/AutoFringer.java
+++ b/src/java/com/threerings/miso/tile/AutoFringer.java
@@ -187,7 +187,7 @@ public class AutoFringer
         }
 
         // otherwise, it's a mask.. look for it in the cache..
-        Long maskkey = new Long((((long) baseset) << 32) +
+        Long maskkey = Long.valueOf((((long) baseset) << 32) +
                                 (fringeset << 16) + index);
         BufferedImage img = (BufferedImage)masks.get(maskkey);
         if (img == null) {
@@ -261,7 +261,7 @@ public class AutoFringer
             } else if (weebits != 0) {
                 index = BITS_TO_INDEX[weebits];
                 if (index != -1) {
-                    indexes.add(new Integer(index));
+                    indexes.add(Integer.valueOf(index));
                 }
                 weebits = 0;
             }
@@ -269,7 +269,7 @@ public class AutoFringer
         if (weebits != 0) {
             index = BITS_TO_INDEX[weebits];
             if (index != -1) {
-                indexes.add(new Integer(index));
+                indexes.add(Integer.valueOf(index));
             }
         }
 
diff --git a/src/java/com/threerings/parlor/card/client/CardGameDecoder.java b/src/java/com/threerings/parlor/card/client/CardGameDecoder.java
index 897b055ea..ab05fcfe6 100644
--- a/src/java/com/threerings/parlor/card/client/CardGameDecoder.java
+++ b/src/java/com/threerings/parlor/card/client/CardGameDecoder.java
@@ -95,6 +95,7 @@ public class CardGameDecoder extends InvocationDecoder
 
         default:
             super.dispatchNotification(methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/parlor/card/data/Card.java b/src/java/com/threerings/parlor/card/data/Card.java
index f2a864f96..0d259a195 100644
--- a/src/java/com/threerings/parlor/card/data/Card.java
+++ b/src/java/com/threerings/parlor/card/data/Card.java
@@ -137,7 +137,7 @@ public class Card implements DSet.Entry, Comparable, CardCodes
     public Comparable getKey ()
     {
         if (_key == null) {
-            _key = new Byte(_value);
+            _key = Byte.valueOf(_value);
         }
         
         return _key;
diff --git a/src/java/com/threerings/parlor/card/server/CardGameSender.java b/src/java/com/threerings/parlor/card/server/CardGameSender.java
index c6cbdd79f..6ad718b6a 100644
--- a/src/java/com/threerings/parlor/card/server/CardGameSender.java
+++ b/src/java/com/threerings/parlor/card/server/CardGameSender.java
@@ -43,7 +43,7 @@ public class CardGameSender extends InvocationSender
     {
         sendNotification(
             target, CardGameDecoder.RECEIVER_CODE, CardGameDecoder.CARDS_TRANSFERRED_BETWEEN_PLAYERS,
-            new Object[] { new Integer(arg1), new Integer(arg2), new Integer(arg3) });
+            new Object[] { Integer.valueOf(arg1), Integer.valueOf(arg2), Integer.valueOf(arg3) });
     }
 
     /**
@@ -55,7 +55,7 @@ public class CardGameSender extends InvocationSender
     {
         sendNotification(
             target, CardGameDecoder.RECEIVER_CODE, CardGameDecoder.RECEIVED_CARDS_FROM_PLAYER,
-            new Object[] { new Integer(arg1), arg2 });
+            new Object[] { Integer.valueOf(arg1), arg2 });
     }
 
     /**
@@ -67,7 +67,7 @@ public class CardGameSender extends InvocationSender
     {
         sendNotification(
             target, CardGameDecoder.RECEIVER_CODE, CardGameDecoder.RECEIVED_HAND,
-            new Object[] { new Integer(arg1), arg2 });
+            new Object[] { Integer.valueOf(arg1), arg2 });
     }
 
     /**
@@ -79,7 +79,7 @@ public class CardGameSender extends InvocationSender
     {
         sendNotification(
             target, CardGameDecoder.RECEIVER_CODE, CardGameDecoder.SENT_CARDS_TO_PLAYER,
-            new Object[] { new Integer(arg1), arg2 });
+            new Object[] { Integer.valueOf(arg1), arg2 });
     }
 
 }
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 e8b14cf21..d03a8fed5 100644
--- a/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
+++ b/src/java/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
     public void playCard (Client arg1, Card arg2, int arg3)
     {
         sendRequest(arg1, PLAY_CARD, new Object[] {
-            arg2, new Integer(arg3)
+            arg2, Integer.valueOf(arg3)
         });
     }
 
@@ -66,7 +66,7 @@ public class TrickCardGameMarshaller extends InvocationMarshaller
     public void sendCardsToPlayer (Client arg1, int arg2, Card[] arg3)
     {
         sendRequest(arg1, SEND_CARDS_TO_PLAYER, new Object[] {
-            new Integer(arg2), arg3
+            Integer.valueOf(arg2), arg3
         });
     }
 
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 cc5531cdc..17655c839 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -78,6 +78,7 @@ public class TrickCardGameDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
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 1293ce8e6..783f8ccc8 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameProvider.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
diff --git a/src/java/com/threerings/parlor/client/ParlorDecoder.java b/src/java/com/threerings/parlor/client/ParlorDecoder.java
index 9e73362cc..e06ce4f77 100644
--- a/src/java/com/threerings/parlor/client/ParlorDecoder.java
+++ b/src/java/com/threerings/parlor/client/ParlorDecoder.java
@@ -95,6 +95,7 @@ public class ParlorDecoder extends InvocationDecoder
 
         default:
             super.dispatchNotification(methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/parlor/data/ParlorMarshaller.java b/src/java/com/threerings/parlor/data/ParlorMarshaller.java
index 73aff4e23..31dc51a6a 100644
--- a/src/java/com/threerings/parlor/data/ParlorMarshaller.java
+++ b/src/java/com/threerings/parlor/data/ParlorMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public class ParlorMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, INVITE_RECEIVED,
-                               new Object[] { new Integer(arg1) }));
+                               new Object[] { Integer.valueOf(arg1) }));
         }
 
         // documentation inherited
@@ -68,6 +68,7 @@ public class ParlorMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
@@ -86,7 +87,7 @@ public class ParlorMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, TABLE_CREATED,
-                               new Object[] { new Integer(arg1) }));
+                               new Object[] { Integer.valueOf(arg1) }));
         }
 
         // documentation inherited
@@ -100,6 +101,7 @@ public class ParlorMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
@@ -113,7 +115,7 @@ public class ParlorMarshaller extends InvocationMarshaller
         ListenerMarshaller listener3 = new ListenerMarshaller();
         listener3.listener = arg3;
         sendRequest(arg1, CANCEL, new Object[] {
-            new Integer(arg2), listener3
+            Integer.valueOf(arg2), listener3
         });
     }
 
@@ -126,7 +128,7 @@ public class ParlorMarshaller extends InvocationMarshaller
         ParlorMarshaller.TableMarshaller listener5 = new ParlorMarshaller.TableMarshaller();
         listener5.listener = arg5;
         sendRequest(arg1, CREATE_TABLE, new Object[] {
-            new Integer(arg2), arg3, arg4, listener5
+            Integer.valueOf(arg2), arg3, arg4, listener5
         });
     }
 
@@ -152,7 +154,7 @@ public class ParlorMarshaller extends InvocationMarshaller
         ListenerMarshaller listener5 = new ListenerMarshaller();
         listener5.listener = arg5;
         sendRequest(arg1, JOIN_TABLE, new Object[] {
-            new Integer(arg2), new Integer(arg3), new Integer(arg4), listener5
+            Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
         });
     }
 
@@ -165,7 +167,7 @@ public class ParlorMarshaller extends InvocationMarshaller
         ListenerMarshaller listener4 = new ListenerMarshaller();
         listener4.listener = arg4;
         sendRequest(arg1, LEAVE_TABLE, new Object[] {
-            new Integer(arg2), new Integer(arg3), listener4
+            Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
         });
     }
 
@@ -178,7 +180,7 @@ public class ParlorMarshaller extends InvocationMarshaller
         ListenerMarshaller listener5 = new ListenerMarshaller();
         listener5.listener = arg5;
         sendRequest(arg1, RESPOND, new Object[] {
-            new Integer(arg2), new Integer(arg3), arg4, listener5
+            Integer.valueOf(arg2), Integer.valueOf(arg3), arg4, listener5
         });
     }
 
diff --git a/src/java/com/threerings/parlor/data/Table.java b/src/java/com/threerings/parlor/data/Table.java
index 783026c6d..8632b9148 100644
--- a/src/java/com/threerings/parlor/data/Table.java
+++ b/src/java/com/threerings/parlor/data/Table.java
@@ -80,7 +80,7 @@ public class Table
     public Table (int lobbyOid, TableConfig tconfig, GameConfig config)
     {
         // assign a unique table id
-        tableId = new Integer(++_tableIdCounter);
+        tableId = Integer.valueOf(++_tableIdCounter);
 
         // keep track of our lobby oid
         this.lobbyOid = lobbyOid;
diff --git a/src/java/com/threerings/parlor/data/TableLobbyObject.java b/src/java/com/threerings/parlor/data/TableLobbyObject.java
index 7d0310122..f2d58824a 100644
--- a/src/java/com/threerings/parlor/data/TableLobbyObject.java
+++ b/src/java/com/threerings/parlor/data/TableLobbyObject.java
@@ -1,5 +1,5 @@
 //
-// $Id: TableLobbyObject.java,v 1.3 2004/08/27 02:20:13 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/parlor/game/data/GameMarshaller.java b/src/java/com/threerings/parlor/game/data/GameMarshaller.java
index 656884a58..f4ebb76be 100644
--- a/src/java/com/threerings/parlor/game/data/GameMarshaller.java
+++ b/src/java/com/threerings/parlor/game/data/GameMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
diff --git a/src/java/com/threerings/parlor/game/data/GameObject.java b/src/java/com/threerings/parlor/game/data/GameObject.java
index ae9adf690..e93864214 100644
--- a/src/java/com/threerings/parlor/game/data/GameObject.java
+++ b/src/java/com/threerings/parlor/game/data/GameObject.java
@@ -294,7 +294,7 @@ public class GameObject extends PlaceObject
     {
         int ovalue = this.state;
         requestAttributeChange(
-            STATE, new Integer(value), new Integer(ovalue));
+            STATE, Integer.valueOf(value), Integer.valueOf(ovalue));
         this.state = value;
     }
 
@@ -310,7 +310,7 @@ public class GameObject extends PlaceObject
     {
         boolean ovalue = this.isRated;
         requestAttributeChange(
-            IS_RATED, new Boolean(value), new Boolean(ovalue));
+            IS_RATED, Boolean.valueOf(value), Boolean.valueOf(ovalue));
         this.isRated = value;
     }
 
@@ -326,7 +326,7 @@ public class GameObject extends PlaceObject
     {
         boolean ovalue = this.isPrivate;
         requestAttributeChange(
-            IS_PRIVATE, new Boolean(value), new Boolean(ovalue));
+            IS_PRIVATE, Boolean.valueOf(value), Boolean.valueOf(ovalue));
         this.isPrivate = value;
     }
 
@@ -392,7 +392,7 @@ public class GameObject extends PlaceObject
     {
         boolean ovalue = this.winners[index];
         requestElementUpdate(
-            WINNERS, index, new Boolean(value), new Boolean(ovalue));
+            WINNERS, index, Boolean.valueOf(value), Boolean.valueOf(ovalue));
         this.winners[index] = value;
     }
 
@@ -408,7 +408,7 @@ public class GameObject extends PlaceObject
     {
         int ovalue = this.roundId;
         requestAttributeChange(
-            ROUND_ID, new Integer(value), new Integer(ovalue));
+            ROUND_ID, Integer.valueOf(value), Integer.valueOf(ovalue));
         this.roundId = value;
     }
 
@@ -441,7 +441,7 @@ public class GameObject extends PlaceObject
     {
         int ovalue = this.playerStatus[index];
         requestElementUpdate(
-            PLAYER_STATUS, index, new Integer(value), new Integer(ovalue));
+            PLAYER_STATUS, index, Integer.valueOf(value), Integer.valueOf(ovalue));
         this.playerStatus[index] = value;
     }
     // AUTO-GENERATED: METHODS END
diff --git a/src/java/com/threerings/parlor/game/server/GameDispatcher.java b/src/java/com/threerings/parlor/game/server/GameDispatcher.java
index 4000f2eb7..c2bdd4053 100644
--- a/src/java/com/threerings/parlor/game/server/GameDispatcher.java
+++ b/src/java/com/threerings/parlor/game/server/GameDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -63,6 +63,7 @@ public class GameDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/parlor/game/server/GameProvider.java b/src/java/com/threerings/parlor/game/server/GameProvider.java
index fd3cce987..94ed70969 100644
--- a/src/java/com/threerings/parlor/game/server/GameProvider.java
+++ b/src/java/com/threerings/parlor/game/server/GameProvider.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
diff --git a/src/java/com/threerings/parlor/server/ParlorDispatcher.java b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
index d6027a0de..d3378ba60 100644
--- a/src/java/com/threerings/parlor/server/ParlorDispatcher.java
+++ b/src/java/com/threerings/parlor/server/ParlorDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -110,6 +110,7 @@ public class ParlorDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/parlor/server/ParlorSender.java b/src/java/com/threerings/parlor/server/ParlorSender.java
index 5108d5cee..23dff9ffb 100644
--- a/src/java/com/threerings/parlor/server/ParlorSender.java
+++ b/src/java/com/threerings/parlor/server/ParlorSender.java
@@ -43,7 +43,7 @@ public class ParlorSender extends InvocationSender
     {
         sendNotification(
             target, ParlorDecoder.RECEIVER_CODE, ParlorDecoder.GAME_IS_READY,
-            new Object[] { new Integer(arg1) });
+            new Object[] { Integer.valueOf(arg1) });
     }
 
     /**
@@ -55,7 +55,7 @@ public class ParlorSender extends InvocationSender
     {
         sendNotification(
             target, ParlorDecoder.RECEIVER_CODE, ParlorDecoder.RECEIVED_INVITE,
-            new Object[] { new Integer(arg1), arg2, arg3 });
+            new Object[] { Integer.valueOf(arg1), arg2, arg3 });
     }
 
     /**
@@ -67,7 +67,7 @@ public class ParlorSender extends InvocationSender
     {
         sendNotification(
             target, ParlorDecoder.RECEIVER_CODE, ParlorDecoder.RECEIVED_INVITE_CANCELLATION,
-            new Object[] { new Integer(arg1) });
+            new Object[] { Integer.valueOf(arg1) });
     }
 
     /**
@@ -79,7 +79,7 @@ public class ParlorSender extends InvocationSender
     {
         sendNotification(
             target, ParlorDecoder.RECEIVER_CODE, ParlorDecoder.RECEIVED_INVITE_RESPONSE,
-            new Object[] { new Integer(arg1), new Integer(arg2), arg3 });
+            new Object[] { Integer.valueOf(arg1), Integer.valueOf(arg2), arg3 });
     }
 
 }
diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java
index c779b00ac..dd34c5792 100644
--- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java
+++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java
@@ -156,7 +156,7 @@ public class ClientDObjectMgr
      */
     public void registerFlushDelay (Class objclass, long delay)
     {
-        _delays.put(objclass, new Long(delay));
+        _delays.put(objclass, Long.valueOf(delay));
     }
 
     /**
@@ -419,7 +419,7 @@ public class ClientDObjectMgr
      * The object action is used to queue up a subscribe or unsubscribe
      * request.
      */
-    protected class ObjectAction
+    protected static final class ObjectAction
     {
         public int oid;
         public Subscriber target;
@@ -438,7 +438,7 @@ public class ClientDObjectMgr
         }
     }
 
-    protected static class PendingRequest
+    protected static final class PendingRequest
     {
         public int oid;
         public ArrayList targets = new ArrayList();
diff --git a/src/java/com/threerings/presents/client/InvocationReceiver.java b/src/java/com/threerings/presents/client/InvocationReceiver.java
index 4794ecd7b..8ed14770a 100644
--- a/src/java/com/threerings/presents/client/InvocationReceiver.java
+++ b/src/java/com/threerings/presents/client/InvocationReceiver.java
@@ -1,5 +1,5 @@
 //
-// $Id: InvocationReceiver.java,v 1.7 2004/08/27 02:20:18 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/presents/client/InvocationService.java b/src/java/com/threerings/presents/client/InvocationService.java
index 154437d50..bb47702d0 100644
--- a/src/java/com/threerings/presents/client/InvocationService.java
+++ b/src/java/com/threerings/presents/client/InvocationService.java
@@ -1,5 +1,5 @@
 //
-// $Id: InvocationService.java,v 1.3 2004/08/27 02:20:18 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/presents/client/TimeBaseService.java b/src/java/com/threerings/presents/client/TimeBaseService.java
index 649295a2e..8a0959908 100644
--- a/src/java/com/threerings/presents/client/TimeBaseService.java
+++ b/src/java/com/threerings/presents/client/TimeBaseService.java
@@ -1,5 +1,5 @@
 //
-// $Id: TimeBaseService.java,v 1.4 2004/08/27 02:20:18 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java
index 25108092d..405b81299 100644
--- a/src/java/com/threerings/presents/data/TimeBaseMarshaller.java
+++ b/src/java/com/threerings/presents/data/TimeBaseMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ public class TimeBaseMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, GOT_TIME_OID,
-                               new Object[] { new Integer(arg1) }));
+                               new Object[] { Integer.valueOf(arg1) }));
         }
 
         // documentation inherited
@@ -64,6 +64,7 @@ public class TimeBaseMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
diff --git a/src/java/com/threerings/presents/data/TimeBaseObject.java b/src/java/com/threerings/presents/data/TimeBaseObject.java
index 5f4483893..368cb2d3d 100644
--- a/src/java/com/threerings/presents/data/TimeBaseObject.java
+++ b/src/java/com/threerings/presents/data/TimeBaseObject.java
@@ -141,7 +141,7 @@ public class TimeBaseObject extends DObject
     {
         long ovalue = this.evenBase;
         requestAttributeChange(
-            EVEN_BASE, new Long(value), new Long(ovalue));
+            EVEN_BASE, Long.valueOf(value), Long.valueOf(ovalue));
         this.evenBase = value;
     }
 
@@ -157,7 +157,7 @@ public class TimeBaseObject extends DObject
     {
         long ovalue = this.oddBase;
         requestAttributeChange(
-            ODD_BASE, new Long(value), new Long(ovalue));
+            ODD_BASE, Long.valueOf(value), Long.valueOf(ovalue));
         this.oddBase = value;
     }
     // AUTO-GENERATED: METHODS END
diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/java/com/threerings/presents/server/InvocationManager.java
index d5e65e2f4..845a6187e 100644
--- a/src/java/com/threerings/presents/server/InvocationManager.java
+++ b/src/java/com/threerings/presents/server/InvocationManager.java
@@ -125,7 +125,7 @@ public class InvocationManager
             bootlist.add(marsh);
         }
 
-        _recentRegServices.put(new Integer(invCode),
+        _recentRegServices.put(Integer.valueOf(invCode),
                                marsh.getClass().getName());
 
 //        Log.info("Registered service [marsh=" + marsh + "].");
@@ -229,7 +229,7 @@ public class InvocationManager
                      "registration was already cleared [code=" + invCode +
                      ", methId=" + methodId +
                      ", args=" + StringUtil.toString(args) + ", marsh=" +
-                     _recentRegServices.get(new Integer(invCode)) + "].");
+                     _recentRegServices.get(Integer.valueOf(invCode)) + "].");
             return;
         }
 
diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java
index 1d54678bc..cda85db93 100644
--- a/src/java/com/threerings/presents/server/PresentsClient.java
+++ b/src/java/com/threerings/presents/server/PresentsClient.java
@@ -208,7 +208,7 @@ public class PresentsClient
 
                 // let the client know that the rug has been yanked out
                 // from under their ass
-                Object[] args = new Object[] { new Integer(clobj.getOid()) };
+                Object[] args = new Object[] { Integer.valueOf(clobj.getOid()) };
                 _clobj.postMessage(ClientObject.CLOBJ_CHANGED, args);
 
                 // call down to any derived classes
diff --git a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
index 2c98e3e96..5bf81daed 100644
--- a/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
+++ b/src/java/com/threerings/presents/server/TimeBaseDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -63,6 +63,7 @@ public class TimeBaseDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/presents/tools/GenUtil.java b/src/java/com/threerings/presents/tools/GenUtil.java
index 00c1dc46c..ce59e38d8 100644
--- a/src/java/com/threerings/presents/tools/GenUtil.java
+++ b/src/java/com/threerings/presents/tools/GenUtil.java
@@ -69,21 +69,21 @@ public class GenUtil
     public static String boxArgument (Class clazz, String name)
     {
         if (clazz == Boolean.TYPE) {
-            return "new Boolean(" + name + ")";
+            return "Boolean.valueOf(" + name + ")";
         } else if (clazz == Byte.TYPE) {
-            return "new Byte(" + name + ")";
+            return "Byte.valueOf(" + name + ")";
         } else if (clazz == Character.TYPE) {
-            return "new Character(" + name + ")";
+            return "Character.valueOf(" + name + ")";
         } else if (clazz == Short.TYPE) {
-            return "new Short(" + name + ")";
+            return "Short.valueOf(" + name + ")";
         } else if (clazz == Integer.TYPE) {
-            return "new Integer(" + name + ")";
+            return "Integer.valueOf(" + name + ")";
         } else if (clazz == Long.TYPE) {
-            return "new Long(" + name + ")";
+            return "Long.valueOf(" + name + ")";
         } else if (clazz == Float.TYPE) {
-            return "new Float(" + name + ")";
+            return "Float.valueOf(" + name + ")";
         } else if (clazz == Double.TYPE) {
-            return "new Double(" + name + ")";
+            return "Double.valueOf(" + name + ")";
         } else {
             return name;
         }
diff --git a/src/java/com/threerings/presents/tools/decoder.tmpl b/src/java/com/threerings/presents/tools/decoder.tmpl
index aa8962c55..cfef78083 100644
--- a/src/java/com/threerings/presents/tools/decoder.tmpl
+++ b/src/java/com/threerings/presents/tools/decoder.tmpl
@@ -47,6 +47,7 @@ public class ${name}Decoder extends InvocationDecoder
 #end
         default:
             super.dispatchNotification(methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/presents/tools/dispatcher.tmpl b/src/java/com/threerings/presents/tools/dispatcher.tmpl
index 5b236e3fc..cd28bf808 100644
--- a/src/java/com/threerings/presents/tools/dispatcher.tmpl
+++ b/src/java/com/threerings/presents/tools/dispatcher.tmpl
@@ -42,6 +42,7 @@ public class ${name}Dispatcher extends InvocationDispatcher
 #end
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/presents/tools/marshaller.tmpl b/src/java/com/threerings/presents/tools/marshaller.tmpl
index f14f8b053..31896101a 100644
--- a/src/java/com/threerings/presents/tools/marshaller.tmpl
+++ b/src/java/com/threerings/presents/tools/marshaller.tmpl
@@ -47,6 +47,7 @@ public class ${name}Marshaller extends InvocationMarshaller
 #end
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
diff --git a/src/java/com/threerings/puzzle/client/PuzzleController.java b/src/java/com/threerings/puzzle/client/PuzzleController.java
index f30dd3b30..05a60019f 100644
--- a/src/java/com/threerings/puzzle/client/PuzzleController.java
+++ b/src/java/com/threerings/puzzle/client/PuzzleController.java
@@ -742,7 +742,7 @@ public abstract class PuzzleController extends GameController
             return;
         }
 
-        _events.add(new Integer(event));
+        _events.add(Integer.valueOf(event));
         if (isSyncingBoards()) {
             _states.add((board == null) ? null : board.clone());
             if (board == null) {
diff --git a/src/java/com/threerings/puzzle/client/PuzzleGameService.java b/src/java/com/threerings/puzzle/client/PuzzleGameService.java
index 9f72ec6bd..4f8a6ce6e 100644
--- a/src/java/com/threerings/puzzle/client/PuzzleGameService.java
+++ b/src/java/com/threerings/puzzle/client/PuzzleGameService.java
@@ -1,5 +1,5 @@
 //
-// $Id: PuzzleGameService.java,v 1.3 2004/10/28 19:20:04 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
index 04d7ca585..809d90081 100644
--- a/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
+++ b/src/java/com/threerings/puzzle/data/PuzzleGameMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@ public class PuzzleGameMarshaller extends InvocationMarshaller
     public void updateProgress (Client arg1, int arg2, int[] arg3)
     {
         sendRequest(arg1, UPDATE_PROGRESS, new Object[] {
-            new Integer(arg2), arg3
+            Integer.valueOf(arg2), arg3
         });
     }
 
@@ -55,7 +55,7 @@ public class PuzzleGameMarshaller extends InvocationMarshaller
     public void updateProgressSync (Client arg1, int arg2, int[] arg3, Board[] arg4)
     {
         sendRequest(arg1, UPDATE_PROGRESS_SYNC, new Object[] {
-            new Integer(arg2), arg3, arg4
+            Integer.valueOf(arg2), arg3, arg4
         });
     }
 
diff --git a/src/java/com/threerings/puzzle/data/PuzzleObject.java b/src/java/com/threerings/puzzle/data/PuzzleObject.java
index 0af07365a..fa6270dfe 100644
--- a/src/java/com/threerings/puzzle/data/PuzzleObject.java
+++ b/src/java/com/threerings/puzzle/data/PuzzleObject.java
@@ -88,7 +88,7 @@ public class PuzzleObject extends GameObject
     {
         int ovalue = this.difficulty;
         requestAttributeChange(
-            DIFFICULTY, new Integer(value), new Integer(ovalue));
+            DIFFICULTY, Integer.valueOf(value), Integer.valueOf(ovalue));
         this.difficulty = value;
     }
 
@@ -137,7 +137,7 @@ public class PuzzleObject extends GameObject
     {
         long ovalue = this.seed;
         requestAttributeChange(
-            SEED, new Long(value), new Long(ovalue));
+            SEED, Long.valueOf(value), Long.valueOf(ovalue));
         this.seed = value;
     }
     // AUTO-GENERATED: METHODS END
diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
index 0b07e01bd..77cfcb687 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleGameDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -72,6 +72,7 @@ public class PuzzleGameDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
index 72e164b48..f55b2d746 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleGameProvider.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
diff --git a/src/java/com/threerings/stage/data/StageSceneMarshaller.java b/src/java/com/threerings/stage/data/StageSceneMarshaller.java
index 454291de4..5e85b9a68 100644
--- a/src/java/com/threerings/stage/data/StageSceneMarshaller.java
+++ b/src/java/com/threerings/stage/data/StageSceneMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
diff --git a/src/java/com/threerings/stage/data/StageSceneObject.java b/src/java/com/threerings/stage/data/StageSceneObject.java
index 4c766f399..45056486e 100644
--- a/src/java/com/threerings/stage/data/StageSceneObject.java
+++ b/src/java/com/threerings/stage/data/StageSceneObject.java
@@ -60,7 +60,7 @@ public class StageSceneObject extends SpotSceneObject
     {
         float ovalue = this.lightLevel;
         requestAttributeChange(
-            LIGHT_LEVEL, new Float(value), new Float(ovalue));
+            LIGHT_LEVEL, Float.valueOf(value), Float.valueOf(ovalue));
         this.lightLevel = value;
     }
 
@@ -76,7 +76,7 @@ public class StageSceneObject extends SpotSceneObject
     {
         int ovalue = this.lightShade;
         requestAttributeChange(
-            LIGHT_SHADE, new Integer(value), new Integer(ovalue));
+            LIGHT_SHADE, Integer.valueOf(value), Integer.valueOf(ovalue));
         this.lightShade = value;
     }
     // AUTO-GENERATED: METHODS END
diff --git a/src/java/com/threerings/stage/server/StageSceneDispatcher.java b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
index f432d51f5..bfe10799d 100644
--- a/src/java/com/threerings/stage/server/StageSceneDispatcher.java
+++ b/src/java/com/threerings/stage/server/StageSceneDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -73,6 +73,7 @@ public class StageSceneDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/stage/server/StageSceneManager.java b/src/java/com/threerings/stage/server/StageSceneManager.java
index c646c0c2e..fb36ad65c 100644
--- a/src/java/com/threerings/stage/server/StageSceneManager.java
+++ b/src/java/com/threerings/stage/server/StageSceneManager.java
@@ -339,7 +339,7 @@ public class StageSceneManager extends SpotSceneManager
 
         // if they are already standing on this tile, allow it
         SceneLocation cloc = (SceneLocation)
-            _ssobj.occupantLocs.get(new Integer(source.getOid()));
+            _ssobj.occupantLocs.get(Integer.valueOf(source.getOid()));
         if (cloc != null) {
             StageLocation sloc = (StageLocation) cloc.loc;
             if (MisoUtil.fullToTile(sloc.x) == tx &&
@@ -697,7 +697,7 @@ public class StageSceneManager extends SpotSceneManager
     protected void positionBody (Cluster cl, int bodyOid, ArrayList locs)
     {
         SceneLocation sloc = (SceneLocation)
-            _ssobj.occupantLocs.get(new Integer(bodyOid));
+            _ssobj.occupantLocs.get(Integer.valueOf(bodyOid));
         if (sloc == null) {
             BodyObject user = (BodyObject)StageServer.omgr.getObject(bodyOid);
             String who = (user == null) ? ("" + bodyOid) : user.who();
@@ -761,7 +761,7 @@ public class StageSceneManager extends SpotSceneManager
         throws InvocationException
     {
         StageOccupantInfo info = (StageOccupantInfo)_ssobj.occupantInfo.get(
-            new Integer(target.getOid()));
+            Integer.valueOf(target.getOid()));
         if (info == null) {
             Log.warning("Have no occinfo for cluster target " +
                         "[where=" + where() + ", init=" + initiator.who() +
diff --git a/src/java/com/threerings/stage/server/StageSceneProvider.java b/src/java/com/threerings/stage/server/StageSceneProvider.java
index d5f9083f7..4e4cc6b12 100644
--- a/src/java/com/threerings/stage/server/StageSceneProvider.java
+++ b/src/java/com/threerings/stage/server/StageSceneProvider.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
diff --git a/src/java/com/threerings/stage/tools/editor/TestTileLoader.java b/src/java/com/threerings/stage/tools/editor/TestTileLoader.java
index 166260a75..6c076ef34 100644
--- a/src/java/com/threerings/stage/tools/editor/TestTileLoader.java
+++ b/src/java/com/threerings/stage/tools/editor/TestTileLoader.java
@@ -134,7 +134,7 @@ public class TestTileLoader implements TileSetIDBroker
     {
         Integer id = (Integer) _idmap.get(tileSetPath);
         if (null == id) {
-            id = new Integer(_fakeID--);
+            id = Integer.valueOf(_fakeID--);
             _idmap.put(tileSetPath, id);
         }
         return id.intValue();
diff --git a/src/java/com/threerings/util/KeyboardManager.java b/src/java/com/threerings/util/KeyboardManager.java
index 6d8da4af9..dde308b9b 100644
--- a/src/java/com/threerings/util/KeyboardManager.java
+++ b/src/java/com/threerings/util/KeyboardManager.java
@@ -539,7 +539,7 @@ public class KeyboardManager
 //                         // definitively check whether the key was released
 //                         long delay = _repeatDelay - deltaRelease;
 //                         _siid = IntervalManager.register(
-//                             this, delay, new Long(_lastPress), false);
+//                             this, delay, Long.valueOf(_lastPress), false);
 //                         if (KeyboardManager.DEBUG_INTERVAL) {
 //                             Log.info("Registered sub-interval " +
 //                                      "[id=" + _siid + "].");
diff --git a/src/java/com/threerings/util/TrackedObject.java b/src/java/com/threerings/util/TrackedObject.java
index b7c19cdb7..25c45b1d4 100644
--- a/src/java/com/threerings/util/TrackedObject.java
+++ b/src/java/com/threerings/util/TrackedObject.java
@@ -1,5 +1,5 @@
 //
-// $Id: TrackedObject.java,v 1.6 2004/08/28 01:23:31 ray Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/whirled/client/SceneDecoder.java b/src/java/com/threerings/whirled/client/SceneDecoder.java
index bad400d18..124800f23 100644
--- a/src/java/com/threerings/whirled/client/SceneDecoder.java
+++ b/src/java/com/threerings/whirled/client/SceneDecoder.java
@@ -63,6 +63,7 @@ public class SceneDecoder extends InvocationDecoder
 
         default:
             super.dispatchNotification(methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/whirled/client/SceneDirector.java b/src/java/com/threerings/whirled/client/SceneDirector.java
index fa0b50cd3..1da90af0f 100644
--- a/src/java/com/threerings/whirled/client/SceneDirector.java
+++ b/src/java/com/threerings/whirled/client/SceneDirector.java
@@ -341,7 +341,7 @@ public class SceneDirector extends BasicDirector
         }
 
         // update our scene cache
-        _scache.put(new Integer(model.sceneId), model);
+        _scache.put(Integer.valueOf(model.sceneId), model);
 
         // and pass through to the normal move succeeded handler
         moveSucceeded(placeId, config);
@@ -446,7 +446,7 @@ public class SceneDirector extends BasicDirector
     protected SceneModel loadSceneModel (int sceneId)
     {
         // first look in the model cache
-        Integer key = new Integer(sceneId);
+        Integer key = Integer.valueOf(sceneId);
         SceneModel model = (SceneModel)_scache.get(key);
 
         // load from the repository if it's not cached
diff --git a/src/java/com/threerings/whirled/client/SceneReceiver.java b/src/java/com/threerings/whirled/client/SceneReceiver.java
index 6a2843d1c..ad9dd6fd1 100644
--- a/src/java/com/threerings/whirled/client/SceneReceiver.java
+++ b/src/java/com/threerings/whirled/client/SceneReceiver.java
@@ -1,5 +1,5 @@
 //
-// $Id: SceneReceiver.java,v 1.2 2004/08/27 02:20:40 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/whirled/client/SceneService.java b/src/java/com/threerings/whirled/client/SceneService.java
index a9e672424..c177fa6aa 100644
--- a/src/java/com/threerings/whirled/client/SceneService.java
+++ b/src/java/com/threerings/whirled/client/SceneService.java
@@ -1,5 +1,5 @@
 //
-// $Id: SceneService.java,v 1.11 2004/08/27 02:20:40 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/whirled/data/SceneMarshaller.java b/src/java/com/threerings/whirled/data/SceneMarshaller.java
index f75267010..188201cdd 100644
--- a/src/java/com/threerings/whirled/data/SceneMarshaller.java
+++ b/src/java/com/threerings/whirled/data/SceneMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -53,7 +53,7 @@ public class SceneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED,
-                               new Object[] { new Integer(arg1), arg2 }));
+                               new Object[] { Integer.valueOf(arg1), arg2 }));
         }
 
         /** The method id used to dispatch {@link #moveSucceededWithScene}
@@ -66,7 +66,7 @@ public class SceneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED_WITH_SCENE,
-                               new Object[] { new Integer(arg1), arg2, arg3 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3 }));
         }
 
         /** The method id used to dispatch {@link #moveSucceededWithUpdates}
@@ -79,7 +79,7 @@ public class SceneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
-                               new Object[] { new Integer(arg1), arg2, arg3 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3 }));
         }
 
         // documentation inherited
@@ -103,6 +103,7 @@ public class SceneMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
@@ -116,7 +117,7 @@ public class SceneMarshaller extends InvocationMarshaller
         SceneMarshaller.SceneMoveMarshaller listener4 = new SceneMarshaller.SceneMoveMarshaller();
         listener4.listener = arg4;
         sendRequest(arg1, MOVE_TO, new Object[] {
-            new Integer(arg2), new Integer(arg3), listener4
+            Integer.valueOf(arg2), Integer.valueOf(arg3), listener4
         });
     }
 
diff --git a/src/java/com/threerings/whirled/data/ScenedBodyObject.java b/src/java/com/threerings/whirled/data/ScenedBodyObject.java
index a7d6b8011..e193258f0 100644
--- a/src/java/com/threerings/whirled/data/ScenedBodyObject.java
+++ b/src/java/com/threerings/whirled/data/ScenedBodyObject.java
@@ -1,5 +1,5 @@
 //
-// $Id: ScenedBodyObject.java,v 1.2 2004/08/27 02:20:42 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/whirled/server/SceneDispatcher.java b/src/java/com/threerings/whirled/server/SceneDispatcher.java
index 3208de738..af36f485f 100644
--- a/src/java/com/threerings/whirled/server/SceneDispatcher.java
+++ b/src/java/com/threerings/whirled/server/SceneDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -67,6 +67,7 @@ public class SceneDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/whirled/server/SceneSender.java b/src/java/com/threerings/whirled/server/SceneSender.java
index a4a1d5205..7dbc1b43a 100644
--- a/src/java/com/threerings/whirled/server/SceneSender.java
+++ b/src/java/com/threerings/whirled/server/SceneSender.java
@@ -41,7 +41,7 @@ public class SceneSender extends InvocationSender
     {
         sendNotification(
             target, SceneDecoder.RECEIVER_CODE, SceneDecoder.FORCED_MOVE,
-            new Object[] { new Integer(arg1) });
+            new Object[] { Integer.valueOf(arg1) });
     }
 
 }
diff --git a/src/java/com/threerings/whirled/spot/data/Cluster.java b/src/java/com/threerings/whirled/spot/data/Cluster.java
index 7ee5db91e..16f0b844a 100644
--- a/src/java/com/threerings/whirled/spot/data/Cluster.java
+++ b/src/java/com/threerings/whirled/spot/data/Cluster.java
@@ -43,7 +43,7 @@ public class Cluster extends Rectangle
     public Comparable getKey ()
     {
         if (_key == null) {
-            _key = new Integer(clusterOid);
+            _key = Integer.valueOf(clusterOid);
         }
         return _key;
     }
diff --git a/src/java/com/threerings/whirled/spot/data/SceneLocation.java b/src/java/com/threerings/whirled/spot/data/SceneLocation.java
index 9d077479c..14340ea34 100644
--- a/src/java/com/threerings/whirled/spot/data/SceneLocation.java
+++ b/src/java/com/threerings/whirled/spot/data/SceneLocation.java
@@ -58,7 +58,7 @@ public class SceneLocation extends SimpleStreamableObject
     public Comparable getKey ()
     {
         if (_key == null) {
-            _key = new Integer(bodyOid);
+            _key = Integer.valueOf(bodyOid);
         }
         return _key;
     }
diff --git a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
index f8d63c7c6..0e2387c92 100644
--- a/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
+++ b/src/java/com/threerings/whirled/spot/data/SpotMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@ public class SpotMarshaller extends InvocationMarshaller
         InvocationMarshaller.ConfirmMarshaller listener4 = new InvocationMarshaller.ConfirmMarshaller();
         listener4.listener = arg4;
         sendRequest(arg1, CHANGE_LOCATION, new Object[] {
-            new Integer(arg2), arg3, listener4
+            Integer.valueOf(arg2), arg3, listener4
         });
     }
 
@@ -60,7 +60,7 @@ public class SpotMarshaller extends InvocationMarshaller
     public void clusterSpeak (Client arg1, String arg2, byte arg3)
     {
         sendRequest(arg1, CLUSTER_SPEAK, new Object[] {
-            arg2, new Byte(arg3)
+            arg2, Byte.valueOf(arg3)
         });
     }
 
@@ -73,7 +73,7 @@ public class SpotMarshaller extends InvocationMarshaller
         InvocationMarshaller.ConfirmMarshaller listener3 = new InvocationMarshaller.ConfirmMarshaller();
         listener3.listener = arg3;
         sendRequest(arg1, JOIN_CLUSTER, new Object[] {
-            new Integer(arg2), listener3
+            Integer.valueOf(arg2), listener3
         });
     }
 
@@ -86,7 +86,7 @@ public class SpotMarshaller extends InvocationMarshaller
         SceneMarshaller.SceneMoveMarshaller listener5 = new SceneMarshaller.SceneMoveMarshaller();
         listener5.listener = arg5;
         sendRequest(arg1, TRAVERSE_PORTAL, new Object[] {
-            new Integer(arg2), new Integer(arg3), new Integer(arg4), listener5
+            Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
         });
     }
 
diff --git a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
index 604cb00f0..092a65f66 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -89,6 +89,7 @@ public class SpotDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
index 832218065..85bd210bd 100644
--- a/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
+++ b/src/java/com/threerings/whirled/spot/server/SpotSceneManager.java
@@ -154,7 +154,7 @@ public class SpotSceneManager extends SceneManager
         super.bodyLeft(bodyOid);
 
         // clear out their location information
-        _ssobj.removeFromOccupantLocs(new Integer(bodyOid));
+        _ssobj.removeFromOccupantLocs(Integer.valueOf(bodyOid));
 
         // clear any cluster they may occupy
         removeFromCluster(bodyOid);
@@ -413,7 +413,7 @@ public class SpotSceneManager extends SceneManager
      */
     protected SceneLocation locationForBody (int bodyOid)
     {
-        return (SceneLocation)_ssobj.occupantLocs.get(new Integer(bodyOid));
+        return (SceneLocation)_ssobj.occupantLocs.get(Integer.valueOf(bodyOid));
     }
 
     /**
diff --git a/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java b/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java
index 008b2ebe7..9105781be 100644
--- a/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java
+++ b/src/java/com/threerings/whirled/zone/client/ZoneDecoder.java
@@ -63,6 +63,7 @@ public class ZoneDecoder extends InvocationDecoder
 
         default:
             super.dispatchNotification(methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/whirled/zone/client/ZoneDirector.java b/src/java/com/threerings/whirled/zone/client/ZoneDirector.java
index 4b8ed2bb0..37951ee0e 100644
--- a/src/java/com/threerings/whirled/zone/client/ZoneDirector.java
+++ b/src/java/com/threerings/whirled/zone/client/ZoneDirector.java
@@ -135,7 +135,7 @@ public class ZoneDirector extends BasicDirector
 
         // let our zone observers know that we're attempting to switch
         // zones
-        notifyObservers(new Integer(zoneId));
+        notifyObservers(Integer.valueOf(zoneId));
 
         // check the version of our cached copy of the scene to which
         // we're requesting to move; if we were unable to load it, assume
diff --git a/src/java/com/threerings/whirled/zone/client/ZoneReceiver.java b/src/java/com/threerings/whirled/zone/client/ZoneReceiver.java
index 14fb5943e..2965038ee 100644
--- a/src/java/com/threerings/whirled/zone/client/ZoneReceiver.java
+++ b/src/java/com/threerings/whirled/zone/client/ZoneReceiver.java
@@ -1,5 +1,5 @@
 //
-// $Id: ZoneReceiver.java,v 1.2 2004/08/27 02:20:50 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/whirled/zone/client/ZoneService.java b/src/java/com/threerings/whirled/zone/client/ZoneService.java
index ea5d0b9de..fc46393be 100644
--- a/src/java/com/threerings/whirled/zone/client/ZoneService.java
+++ b/src/java/com/threerings/whirled/zone/client/ZoneService.java
@@ -1,5 +1,5 @@
 //
-// $Id: ZoneService.java,v 1.8 2004/08/27 02:20:50 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
index ecd7bb0d1..8b5eee91b 100644
--- a/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
+++ b/src/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -54,7 +54,7 @@ public class ZoneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED,
-                               new Object[] { new Integer(arg1), arg2, arg3 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3 }));
         }
 
         /** The method id used to dispatch {@link #moveSucceededWithScene}
@@ -67,7 +67,7 @@ public class ZoneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED_WITH_SCENE,
-                               new Object[] { new Integer(arg1), arg2, arg3, arg4 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }));
         }
 
         /** The method id used to dispatch {@link #moveSucceededWithUpdates}
@@ -80,7 +80,7 @@ public class ZoneMarshaller extends InvocationMarshaller
             _invId = null;
             omgr.postEvent(new InvocationResponseEvent(
                                callerOid, requestId, MOVE_SUCCEEDED_WITH_UPDATES,
-                               new Object[] { new Integer(arg1), arg2, arg3, arg4 }));
+                               new Object[] { Integer.valueOf(arg1), arg2, arg3, arg4 }));
         }
 
         // documentation inherited
@@ -104,6 +104,7 @@ public class ZoneMarshaller extends InvocationMarshaller
 
             default:
                 super.dispatchResponse(methodId, args);
+                return;
             }
         }
     }
@@ -117,7 +118,7 @@ public class ZoneMarshaller extends InvocationMarshaller
         ZoneMarshaller.ZoneMoveMarshaller listener5 = new ZoneMarshaller.ZoneMoveMarshaller();
         listener5.listener = arg5;
         sendRequest(arg1, MOVE_TO, new Object[] {
-            new Integer(arg2), new Integer(arg3), new Integer(arg4), listener5
+            Integer.valueOf(arg2), Integer.valueOf(arg3), Integer.valueOf(arg4), listener5
         });
     }
 
diff --git a/src/java/com/threerings/whirled/zone/data/ZonedBodyObject.java b/src/java/com/threerings/whirled/zone/data/ZonedBodyObject.java
index f9007041f..8b56acd49 100644
--- a/src/java/com/threerings/whirled/zone/data/ZonedBodyObject.java
+++ b/src/java/com/threerings/whirled/zone/data/ZonedBodyObject.java
@@ -1,5 +1,5 @@
 //
-// $Id: ZonedBodyObject.java,v 1.3 2004/08/27 02:20:51 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
diff --git a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
index dc4554fa6..e067b4b15 100644
--- a/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
+++ b/src/java/com/threerings/whirled/zone/server/ZoneDispatcher.java
@@ -2,7 +2,7 @@
 // $Id$
 //
 // Narya library - tools for developing networked games
-// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
 // http://www.threerings.net/code/narya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -68,6 +68,7 @@ public class ZoneDispatcher extends InvocationDispatcher
 
         default:
             super.dispatchRequest(source, methodId, args);
+            return;
         }
     }
 }
diff --git a/src/java/com/threerings/whirled/zone/server/ZoneSender.java b/src/java/com/threerings/whirled/zone/server/ZoneSender.java
index a0877bbe5..09a29c564 100644
--- a/src/java/com/threerings/whirled/zone/server/ZoneSender.java
+++ b/src/java/com/threerings/whirled/zone/server/ZoneSender.java
@@ -41,7 +41,7 @@ public class ZoneSender extends InvocationSender
     {
         sendNotification(
             target, ZoneDecoder.RECEIVER_CODE, ZoneDecoder.FORCED_MOVE,
-            new Object[] { new Integer(arg1), new Integer(arg2) });
+            new Object[] { Integer.valueOf(arg1), Integer.valueOf(arg2) });
     }
 
 }