diff --git a/src/java/com/threerings/crowd/data/PlaceObject.java b/src/java/com/threerings/crowd/data/PlaceObject.java
index b677de224..fb4ed2306 100644
--- a/src/java/com/threerings/crowd/data/PlaceObject.java
+++ b/src/java/com/threerings/crowd/data/PlaceObject.java
@@ -176,10 +176,10 @@ public class PlaceObject extends DObject
      * change. Proxied copies of this object (on clients) will apply the
      * value change when they received the attribute changed notification.
      */
-    public void setOccupantInfo (DSet value)
+    public void setOccupantInfo (DSet<com.threerings.crowd.data.OccupantInfo> value)
     {
         requestAttributeChange(OCCUPANT_INFO, value, this.occupantInfo);
-        this.occupantInfo = (value == null) ? null : (DSet)value.clone();
+        this.occupantInfo = (value == null) ? null : value.typedClone();
     }
 
     /**
diff --git a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
index 0ac907d0e..2df53f718 100644
--- a/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
+++ b/src/java/com/threerings/micasa/lobby/table/TableLobbyObject.java
@@ -105,7 +105,7 @@ public class TableLobbyObject
     public void setTableSet (DSet value)
     {
         requestAttributeChange(TABLE_SET, value, this.tableSet);
-        this.tableSet = (value == null) ? null : (DSet)value.clone();
+        this.tableSet = (value == null) ? null : value.typedClone();
     }
     // AUTO-GENERATED: METHODS END
 }
diff --git a/src/java/com/threerings/presents/data/ClientObject.java b/src/java/com/threerings/presents/data/ClientObject.java
index 9fe7b064a..5b3e557b3 100644
--- a/src/java/com/threerings/presents/data/ClientObject.java
+++ b/src/java/com/threerings/presents/data/ClientObject.java
@@ -125,7 +125,7 @@ public class ClientObject extends DObject
     public void setReceivers (DSet value)
     {
         requestAttributeChange(RECEIVERS, value, this.receivers);
-        this.receivers = (value == null) ? null : (DSet)value.clone();
+        this.receivers = (value == null) ? null : value.typedClone();
     }
     // AUTO-GENERATED: METHODS END
 }
diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
index e038a561e..0344a64fc 100644
--- a/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
+++ b/src/java/com/threerings/whirled/spot/data/SpotSceneObject.java
@@ -88,7 +88,7 @@ public class SpotSceneObject extends SceneObject
     public void setOccupantLocs (DSet value)
     {
         requestAttributeChange(OCCUPANT_LOCS, value, this.occupantLocs);
-        this.occupantLocs = (value == null) ? null : (DSet)value.clone();
+        this.occupantLocs = (value == null) ? null : value.typedClone();
     }
 
     /**
@@ -134,7 +134,7 @@ public class SpotSceneObject extends SceneObject
     public void setClusters (DSet value)
     {
         requestAttributeChange(CLUSTERS, value, this.clusters);
-        this.clusters = (value == null) ? null : (DSet)value.clone();
+        this.clusters = (value == null) ? null : value.typedClone();
     }
     // AUTO-GENERATED: METHODS END
 }