diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java
index 14cb6250f..a269dbb9f 100644
--- a/src/java/com/threerings/presents/client/Client.java
+++ b/src/java/com/threerings/presents/client/Client.java
@@ -348,8 +348,7 @@ public class Client
         for (int ii = 0; ii < scount; ii++) {
             InvocationService service = _bstrap.services.get(ii);
             if (sclass.isInstance(service)) {
-                @SuppressWarnings("unchecked") T asSclass = (T)service;
-                return asSclass;
+                return sclass.cast(service);
             }
         }
         return null;
diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java
index 8888d19e9..f6349a425 100644
--- a/src/java/com/threerings/presents/dobj/DObject.java
+++ b/src/java/com/threerings/presents/dobj/DObject.java
@@ -716,8 +716,7 @@ public class DObject
     {
         for (Object attr : _locattrs) {
             if (key.isInstance(attr)) {
-                @SuppressWarnings("unchecked") T casted = (T)attr;
-                return casted;
+                return key.cast(attr);
             }
         }
         return null;