diff --git a/src/java/com/threerings/micasa/lobby/LobbyRegistry.java b/src/java/com/threerings/micasa/lobby/LobbyRegistry.java
index 4be9835a..5804a5d6 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyRegistry.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyRegistry.java
@@ -114,8 +114,8 @@ public class LobbyRegistry
         if (lmgrs == null || lmgrs.length == 0) {
             log.warning("No lobbies specified in config file (via '" + LOBIDS_KEY + "' parameter).");
         } else {
-            for (int i = 0; i < lmgrs.length; i++) {
-                loadLobby(lmgrs[i]);
+            for (String lmgr : lmgrs) {
+                loadLobby(lmgr);
             }
         }
     }
diff --git a/src/java/com/threerings/parlor/data/Table.java b/src/java/com/threerings/parlor/data/Table.java
index c66ddb71..75e80305 100644
--- a/src/java/com/threerings/parlor/data/Table.java
+++ b/src/java/com/threerings/parlor/data/Table.java
@@ -376,8 +376,8 @@ public class Table
             int[][] teams = tconfig.teamMemberIndices;
             for (int[] team : teams) {
                 int teamCount = 0;
-                for (int jj=0; jj < team.length; jj++) {
-                    if (players[team[jj]] != null) {
+                for (int element : team) {
+                    if (players[element] != null) {
                         teamCount++;
                     }
                 }
diff --git a/src/java/com/threerings/parlor/server/TableManager.java b/src/java/com/threerings/parlor/server/TableManager.java
index 3cff429d..a62802f6 100644
--- a/src/java/com/threerings/parlor/server/TableManager.java
+++ b/src/java/com/threerings/parlor/server/TableManager.java
@@ -355,9 +355,9 @@ public class TableManager
 
         // clear out all matching entries in the boid map
         if (table.bodyOids != null) {
-            for (int ii = 0; ii < table.bodyOids.length; ii++) {
-                if (table.bodyOids[ii] != 0) {
-                    notePlayerRemoved(table.bodyOids[ii]);
+            for (int bodyOid : table.bodyOids) {
+                if (bodyOid != 0) {
+                    notePlayerRemoved(bodyOid);
                 }
             }
         }
@@ -471,9 +471,9 @@ public class TableManager
 
         if (table.bodyOids != null) {
             // clear the player to table mappings as this game is underway
-            for (int ii = 0; ii < table.bodyOids.length; ii++) {
-                if (table.bodyOids[ii] != 0) {
-                    notePlayerRemoved(table.bodyOids[ii]);
+            for (int bodyOid : table.bodyOids) {
+                if (bodyOid != 0) {
+                    notePlayerRemoved(bodyOid);
                 }
             }
         }
diff --git a/src/java/com/threerings/stage/data/ModifyObjectsUpdate.java b/src/java/com/threerings/stage/data/ModifyObjectsUpdate.java
index b042fff4..ae4cca72 100644
--- a/src/java/com/threerings/stage/data/ModifyObjectsUpdate.java
+++ b/src/java/com/threerings/stage/data/ModifyObjectsUpdate.java
@@ -63,15 +63,15 @@ public class ModifyObjectsUpdate extends SceneUpdate
 
         // wipe out the objects that need to go
         if (removed != null) {
-            for (int ii = 0; ii < removed.length; ii++) {
-                mmodel.removeObject(removed[ii]);
+            for (ObjectInfo element : removed) {
+                mmodel.removeObject(element);
             }
         }
 
         // add the new objects
         if (added != null) {
-            for (int ii = 0; ii < added.length; ii++) {
-                mmodel.addObject(added[ii]);
+            for (ObjectInfo element : added) {
+                mmodel.addObject(element);
             }
         }
     }
diff --git a/src/java/com/threerings/stage/data/StageMisoSceneModel.java b/src/java/com/threerings/stage/data/StageMisoSceneModel.java
index 600fd241..1188f6ec 100644
--- a/src/java/com/threerings/stage/data/StageMisoSceneModel.java
+++ b/src/java/com/threerings/stage/data/StageMisoSceneModel.java
@@ -55,9 +55,9 @@ public class StageMisoSceneModel extends SparseMisoSceneModel
      */
     public static StageMisoSceneModel getSceneModel (SceneModel model)
     {
-        for (int ii = 0; ii < model.auxModels.length; ii++) {
-            if (model.auxModels[ii] instanceof StageMisoSceneModel) {
-                return (StageMisoSceneModel)model.auxModels[ii];
+        for (AuxModel auxModel : model.auxModels) {
+            if (auxModel instanceof StageMisoSceneModel) {
+                return (StageMisoSceneModel)auxModel;
             }
         }
         return null;
diff --git a/src/java/com/threerings/stage/tools/viewer/ViewerFrame.java b/src/java/com/threerings/stage/tools/viewer/ViewerFrame.java
index 6cf5b49c..fdb5d400 100644
--- a/src/java/com/threerings/stage/tools/viewer/ViewerFrame.java
+++ b/src/java/com/threerings/stage/tools/viewer/ViewerFrame.java
@@ -162,8 +162,7 @@ public class ViewerFrame extends ManagedJFrame
                 SpotSceneModel ssmodel = SpotSceneModel.getSceneModel(model);
                 Location defloc = null;
                 // find the default entrance to this scene
-                for (int ii = 0; ii < ssmodel.portals.length; ii++) {
-                    Portal port = ssmodel.portals[ii];
+                for (Portal port : ssmodel.portals) {
                     if (port.portalId == ssmodel.defaultEntranceId) {
                         defloc = port.getOppLocation();
                         break;
diff --git a/src/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java b/src/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java
index 23274861..9b6cafa6 100644
--- a/src/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java
+++ b/src/java/com/threerings/stage/tools/viewer/ViewerScenePanel.java
@@ -64,10 +64,8 @@ public class ViewerScenePanel extends StageScenePanel
         _charmgr = charmgr;
 
         // create the character descriptors
-        _descUser = CastUtil.getRandomDescriptor(
-            "female", ctx.getComponentRepository());
-        _descDecoy = CastUtil.getRandomDescriptor(
-            "male", ctx.getComponentRepository());
+        _descUser = CastUtil.getRandomDescriptor("female", ctx.getComponentRepository());
+        _descDecoy = CastUtil.getRandomDescriptor("male", ctx.getComponentRepository());
 
         // create the manipulable sprite
         _sprite = createSprite(_descUser);
@@ -87,8 +85,8 @@ public class ViewerScenePanel extends StageScenePanel
         _sprite.setLocation(defpos.x, defpos.y);
 
         if (_decoys != null) {
-            for (int ii = 0; ii < _decoys.length; ii++) {
-                _decoys[ii].setLocation(defpos.x, defpos.y);
+            for (CharacterSprite decoy : _decoys) {
+                decoy.setLocation(defpos.x, defpos.y);
             }
             createDecoyPaths();
         }
@@ -144,9 +142,9 @@ public class ViewerScenePanel extends StageScenePanel
     protected void createDecoyPaths ()
     {
         if (_decoys != null) {
-            for (int ii = 0; ii < _decoys.length; ii++) {
-                if (_decoys[ii] != null) {
-                    createRandomPath(_decoys[ii]);
+            for (CharacterSprite decoy : _decoys) {
+                if (decoy != null) {
+                    createRandomPath(decoy);
                 }
             }
         }
@@ -177,8 +175,8 @@ public class ViewerScenePanel extends StageScenePanel
 
         case MouseEvent.BUTTON2_MASK:
             if (_decoys != null) {
-                for (int ii = 0; ii < _decoys.length; ii++) {
-                    createPath(_decoys[ii], x, y);
+                for (CharacterSprite decoy : _decoys) {
+                    createPath(decoy, x, y);
                 }
             }
             break;
diff --git a/src/java/com/threerings/stage/tools/xml/StageSceneWriter.java b/src/java/com/threerings/stage/tools/xml/StageSceneWriter.java
index edce2dd2..40515a7f 100644
--- a/src/java/com/threerings/stage/tools/xml/StageSceneWriter.java
+++ b/src/java/com/threerings/stage/tools/xml/StageSceneWriter.java
@@ -66,11 +66,11 @@ public class StageSceneWriter extends SceneWriter
         if (sscene.defaultColors != null) {
             writer.startElement("zations");
             int[] keys = sscene.defaultColors.getKeys();
-            for (int ii=0, nn=keys.length; ii < nn; ii++) {
-                int value = sscene.defaultColors.get(keys[ii]);
+            for (int key : keys) {
+                int value = sscene.defaultColors.get(key);
                 AttributesImpl attrs = new AttributesImpl();
                 attrs.addAttribute("", "classId", "", "",
-                                   String.valueOf(keys[ii]));
+                                   String.valueOf(key));
                 attrs.addAttribute("", "colorId", "", "",
                                    String.valueOf(value));
                 writer.emptyElement("", "zation", "", attrs);
diff --git a/src/java/com/threerings/stats/data/ByteStringSetStat.java b/src/java/com/threerings/stats/data/ByteStringSetStat.java
index 09776fd1..48946c1c 100644
--- a/src/java/com/threerings/stats/data/ByteStringSetStat.java
+++ b/src/java/com/threerings/stats/data/ByteStringSetStat.java
@@ -36,8 +36,8 @@ public class ByteStringSetStat extends StringSetStat
         throws IOException
     {
         out.writeByte(_values.length);
-        for (int ii = 0; ii < _values.length; ii++) {
-            out.writeByte((byte)aux.getStringCode(_type, _values[ii]));
+        for (String value : _values) {
+            out.writeByte((byte)aux.getStringCode(_type, value));
         }
     }
 
diff --git a/src/java/com/threerings/stats/data/IntStringSetStat.java b/src/java/com/threerings/stats/data/IntStringSetStat.java
index fd21d078..3fccf4c5 100644
--- a/src/java/com/threerings/stats/data/IntStringSetStat.java
+++ b/src/java/com/threerings/stats/data/IntStringSetStat.java
@@ -36,8 +36,8 @@ public class IntStringSetStat extends StringSetStat
         throws IOException
     {
         out.writeInt(_values.length);
-        for (int ii = 0; ii < _values.length; ii++) {
-            out.writeInt(aux.getStringCode(_type, _values[ii]));
+        for (String value : _values) {
+            out.writeInt(aux.getStringCode(_type, value));
         }
     }
 
diff --git a/src/java/com/threerings/stats/data/ShortStringSetStat.java b/src/java/com/threerings/stats/data/ShortStringSetStat.java
index 171ed42a..bcf0327e 100644
--- a/src/java/com/threerings/stats/data/ShortStringSetStat.java
+++ b/src/java/com/threerings/stats/data/ShortStringSetStat.java
@@ -36,8 +36,8 @@ public class ShortStringSetStat extends StringSetStat
         throws IOException
     {
         out.writeShort(_values.length);
-        for (int ii = 0; ii < _values.length; ii++) {
-            out.writeShort((short)aux.getStringCode(_type, _values[ii]));
+        for (String value : _values) {
+            out.writeShort((short)aux.getStringCode(_type, value));
         }
     }
 
diff --git a/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java b/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java
index cb6f497f..fb15d0f6 100644
--- a/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java
+++ b/src/java/com/threerings/whirled/spot/tools/xml/SpotSceneWriter.java
@@ -31,6 +31,7 @@ import com.megginson.sax.DataWriter;
 import com.threerings.tools.xml.NestableWriter;
 
 import com.threerings.whirled.spot.data.Location;
+import com.threerings.whirled.spot.data.Portal;
 import com.threerings.whirled.spot.data.SpotSceneModel;
 import com.threerings.whirled.spot.tools.EditablePortal;
 
@@ -70,8 +71,8 @@ public class SpotSceneWriter
         throws SAXException
     {
         // write out the portal info
-        for (int ii = 0; ii < model.portals.length; ii++) {
-            EditablePortal port = (EditablePortal)model.portals[ii];
+        for (Portal portal : model.portals) {
+            EditablePortal port = (EditablePortal)portal;
             AttributesImpl attrs = new AttributesImpl();
             attrs.addAttribute("", "portalId", "", "",
                                String.valueOf(port.portalId));
@@ -90,13 +91,13 @@ public class SpotSceneWriter
         // more sophisticated could be done
         Class<?> clazz = portalLoc.getClass();
         Field[] fields = clazz.getFields();
-        for (int ii=0; ii < fields.length; ii++) {
+        for (Field field : fields) {
             try {
-                attrs.addAttribute("", fields[ii].getName(), "", "",
-                    String.valueOf(fields[ii].get(portalLoc)));
+                attrs.addAttribute("", field.getName(), "", "",
+                    String.valueOf(field.get(portalLoc)));
             } catch (IllegalAccessException iae) {
                 log.warning("Unable to write portal field, skipping " +
-                    "[field=" + fields[ii].getName() + ", e=" + iae + "].");
+                    "[field=" + field.getName() + ", e=" + iae + "].");
             }
         }
     }