diff --git a/src/java/com/threerings/admin/server/ConfigRegistry.java b/src/java/com/threerings/admin/server/ConfigRegistry.java
index 27b27c24b..003d38f0f 100644
--- a/src/java/com/threerings/admin/server/ConfigRegistry.java
+++ b/src/java/com/threerings/admin/server/ConfigRegistry.java
@@ -222,7 +222,7 @@ public abstract class ConfigRegistry
         {
             // mirror this configuration update to the persistent config
             Object value = event.getValue();
-            if (value instanceof DSet) {
+            if (value instanceof DSet<?>) {
                 serializeAttribute(event.getName());
             } else {
                 updateValue(event.getName(), value);
diff --git a/src/java/com/threerings/io/Streamer.java b/src/java/com/threerings/io/Streamer.java
index 84195054e..001247f5c 100644
--- a/src/java/com/threerings/io/Streamer.java
+++ b/src/java/com/threerings/io/Streamer.java
@@ -88,7 +88,7 @@ public class Streamer
      */
     public static Class<?> getStreamerClass (Object object)
     {
-        return (object instanceof Enum) ?
+        return (object instanceof Enum<?>) ?
             ((Enum<?>)object).getDeclaringClass() : object.getClass();
     }
 
diff --git a/src/java/com/threerings/presents/dobj/EntryAddedEvent.java b/src/java/com/threerings/presents/dobj/EntryAddedEvent.java
index da9956276..7b82f0aaf 100644
--- a/src/java/com/threerings/presents/dobj/EntryAddedEvent.java
+++ b/src/java/com/threerings/presents/dobj/EntryAddedEvent.java
@@ -95,7 +95,7 @@ public class EntryAddedEvent<T extends DSet.Entry> extends NamedEvent
     @Override
     protected void notifyListener (Object listener)
     {
-        if (listener instanceof SetListener) {
+        if (listener instanceof SetListener<?>) {
             @SuppressWarnings("unchecked") SetListener<T> setlist = (SetListener<T>)listener;
             setlist.entryAdded(this);
         }
diff --git a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java
index ad707339b..b7e7e9275 100644
--- a/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java
+++ b/src/java/com/threerings/presents/dobj/EntryRemovedEvent.java
@@ -101,7 +101,7 @@ public class EntryRemovedEvent<T extends DSet.Entry> extends NamedEvent
     @Override
     protected void notifyListener (Object listener)
     {
-        if (listener instanceof SetListener) {
+        if (listener instanceof SetListener<?>) {
             @SuppressWarnings("unchecked") SetListener<T> setlist = (SetListener<T>)listener;
             setlist.entryRemoved(this);
         }
diff --git a/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java b/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
index 176057ec8..7e627238e 100644
--- a/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
+++ b/src/java/com/threerings/presents/dobj/EntryUpdatedEvent.java
@@ -120,7 +120,7 @@ public class EntryUpdatedEvent<T extends DSet.Entry> extends NamedEvent
     @Override
     protected void notifyListener (Object listener)
     {
-        if (listener instanceof SetListener) {
+        if (listener instanceof SetListener<?>) {
             @SuppressWarnings("unchecked") SetListener<T> setlist = (SetListener<T>)listener;
             setlist.entryUpdated(this);
         }
diff --git a/src/java/com/threerings/presents/server/ReportingInvoker.java b/src/java/com/threerings/presents/server/ReportingInvoker.java
index a737166e8..ca496fadc 100644
--- a/src/java/com/threerings/presents/server/ReportingInvoker.java
+++ b/src/java/com/threerings/presents/server/ReportingInvoker.java
@@ -131,7 +131,7 @@ public class ReportingInvoker extends Invoker
             if (PresentsDObjectMgr.UNIT_PROF_ENABLED) {
                 for (Object key : _tracker.keySet()) {
                     UnitProfile profile = _tracker.get(key);
-                    if (key instanceof Class) {
+                    if (key instanceof Class<?>) {
                         key = StringUtil.shortClassName((Class<?>)key);
                     }
                     buf.append("  ").append(key).append(" ");
diff --git a/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java b/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java
index 0b33be559..17ff57eab 100644
--- a/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java
+++ b/src/java/com/threerings/presents/tools/GenActionScriptBundlesTask.java
@@ -94,30 +94,29 @@ public class GenActionScriptBundlesTask extends Task
         out.println("{");
         out.println("    override protected function getContent () :Object");
         out.println("    {");
-        if (true) {
-            // create an array with all the values, then populate in a loop
-            out.println("        var data :Array = [");
-            for (Map.Entry<Object, Object> entry : props.entrySet()) {
-                String key = saveConvert((String) entry.getKey());
-                String val = saveConvert((String) entry.getValue());
-                out.println("            \"" + key + "\", \"" + val + "\",");
-            }
-            out.println("            null];");
-            out.println("        var o :Object = new Object();");
-            out.println("        for (var ii :int = 0; ii < data.length; ii += 2) {");
-            out.println("            o[data[ii]] = data[ii + 1];");
-            out.println("        }");
 
-        } else {
-            // alternate impl: just set each value directly. For non-trivial
-            // resource bundles, this generates a larger class after compilation
-            out.println("        var o :Object = new Object();");
-            for (Map.Entry<Object, Object> entry : props.entrySet()) {
-                String key = saveConvert((String) entry.getKey());
-                String val = saveConvert((String) entry.getValue());
-                out.println("        o[\"" + key + "\"] = \"" + val + "\";");
-            }
+        // create an array with all the values, then populate in a loop
+        out.println("        var data :Array = [");
+        for (Map.Entry<Object, Object> entry : props.entrySet()) {
+            String key = saveConvert((String) entry.getKey());
+            String val = saveConvert((String) entry.getValue());
+            out.println("            \"" + key + "\", \"" + val + "\",");
         }
+        out.println("            null];");
+        out.println("        var o :Object = new Object();");
+        out.println("        for (var ii :int = 0; ii < data.length; ii += 2) {");
+        out.println("            o[data[ii]] = data[ii + 1];");
+        out.println("        }");
+
+//         // alternate impl: just set each value directly. For non-trivial
+//         // resource bundles, this generates a larger class after compilation
+//         out.println("        var o :Object = new Object();");
+//         for (Map.Entry<Object, Object> entry : props.entrySet()) {
+//             String key = saveConvert((String) entry.getKey());
+//             String val = saveConvert((String) entry.getValue());
+//             out.println("        o[\"" + key + "\"] = \"" + val + "\";");
+//         }
+
         out.println("        return o;");
         out.println("   }");
         out.println("}}");
diff --git a/src/java/com/threerings/presents/tools/InvocationTask.java b/src/java/com/threerings/presents/tools/InvocationTask.java
index 3bac795ab..233b229d4 100644
--- a/src/java/com/threerings/presents/tools/InvocationTask.java
+++ b/src/java/com/threerings/presents/tools/InvocationTask.java
@@ -142,7 +142,7 @@ public abstract class InvocationTask extends Task
 
         protected void addImportsForType (Type type, ImportSet imports)
         {
-            if (type instanceof Class) {
+            if (type instanceof Class<?>) {
                 imports.add((Class<?>)type);
             } else if (type instanceof ParameterizedType) {
                 imports.add((Class<?>)((ParameterizedType)type).getRawType());
@@ -326,7 +326,7 @@ public abstract class InvocationTask extends Task
 
         protected String unboxArgument (Type type, int index, boolean listenerMode)
         {
-            if (listenerMode && (type instanceof Class) &&
+            if (listenerMode && (type instanceof Class<?>) &&
                 _ilistener.isAssignableFrom((Class<?>)type)) {
                 return "listener" + index;
             } else {
diff --git a/src/java/com/threerings/util/StreamableEnumSet.java b/src/java/com/threerings/util/StreamableEnumSet.java
index fa9a9ac23..1d86d2d03 100644
--- a/src/java/com/threerings/util/StreamableEnumSet.java
+++ b/src/java/com/threerings/util/StreamableEnumSet.java
@@ -70,7 +70,7 @@ public class StreamableEnumSet<E extends Enum<E>> extends AbstractSet<E>
      */
     public static <E extends Enum<E>> StreamableEnumSet<E> copyOf (Collection<E> s)
     {
-        if (s instanceof StreamableEnumSet) {
+        if (s instanceof StreamableEnumSet<?>) {
             StreamableEnumSet<E> set = (StreamableEnumSet<E>)s;
             return copyOf(set);
         }