diff --git a/build.xml b/build.xml
index b44ffd3c..54cafdd5 100644
--- a/build.xml
+++ b/build.xml
@@ -29,7 +29,7 @@
 
   <target name="-preptools" depends="-prepare">
     <artifact:dependencies pathId="tools.classpath">
-      <dependency groupId="com.threerings" artifactId="narya-tools" version="1.4-SNAPSHOT"/>
+      <dependency groupId="com.threerings" artifactId="narya-tools" version="1.8-SNAPSHOT"/>
     </artifact:dependencies>
     <taskdef resource="com/threerings/presents/tools.properties" classpathref="tools.classpath"/>
   </target>
diff --git a/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java b/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java
index 26dc230e..787934e5 100644
--- a/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java
+++ b/src/main/java/com/threerings/micasa/lobby/LobbyMarshaller.java
@@ -40,7 +40,7 @@ public class LobbyMarshaller extends InvocationMarshaller
     implements LobbyService
 {
     /**
-     * Marshalls results to implementations of {@link LobbyService.CategoriesListener}.
+     * Marshalls results to implementations of {@code LobbyService.CategoriesListener}.
      */
     public static class CategoriesMarshaller extends ListenerMarshaller
         implements CategoriesListener
@@ -75,7 +75,7 @@ public class LobbyMarshaller extends InvocationMarshaller
     }
 
     /**
-     * Marshalls results to implementations of {@link LobbyService.LobbiesListener}.
+     * Marshalls results to implementations of {@code LobbyService.LobbiesListener}.
      */
     public static class LobbiesMarshaller extends ListenerMarshaller
         implements LobbiesListener
diff --git a/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java b/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java
index 8f4a780f..9342da91 100644
--- a/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java
+++ b/src/main/java/com/threerings/parlor/data/ParlorMarshaller.java
@@ -43,7 +43,7 @@ public class ParlorMarshaller extends InvocationMarshaller
     implements ParlorService
 {
     /**
-     * Marshalls results to implementations of {@link ParlorService.InviteListener}.
+     * Marshalls results to implementations of {@code ParlorService.InviteListener}.
      */
     public static class InviteMarshaller extends ListenerMarshaller
         implements InviteListener
diff --git a/src/main/java/com/threerings/whirled/data/SceneMarshaller.java b/src/main/java/com/threerings/whirled/data/SceneMarshaller.java
index 6b55c9ee..f3054ab4 100644
--- a/src/main/java/com/threerings/whirled/data/SceneMarshaller.java
+++ b/src/main/java/com/threerings/whirled/data/SceneMarshaller.java
@@ -41,7 +41,7 @@ public class SceneMarshaller extends InvocationMarshaller
     implements SceneService
 {
     /**
-     * Marshalls results to implementations of {@link SceneService.SceneMoveListener}.
+     * Marshalls results to implementations of {@code SceneService.SceneMoveListener}.
      */
     public static class SceneMoveMarshaller extends ListenerMarshaller
         implements SceneMoveListener
diff --git a/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java b/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java
index a135fc8a..2e167441 100644
--- a/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java
+++ b/src/main/java/com/threerings/whirled/spot/data/SpotMarshaller.java
@@ -44,7 +44,7 @@ public class SpotMarshaller extends InvocationMarshaller
     implements SpotService
 {
     /**
-     * Marshalls results to implementations of {@link SpotService.SpotSceneMoveListener}.
+     * Marshalls results to implementations of {@code SpotService.SpotSceneMoveListener}.
      */
     public static class SpotSceneMoveMarshaller extends ListenerMarshaller
         implements SpotSceneMoveListener
diff --git a/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java b/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
index 7c0cf304..2bf7747c 100644
--- a/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
+++ b/src/main/java/com/threerings/whirled/zone/data/ZoneMarshaller.java
@@ -43,7 +43,7 @@ public class ZoneMarshaller extends InvocationMarshaller
     implements ZoneService
 {
     /**
-     * Marshalls results to implementations of {@link ZoneService.ZoneMoveListener}.
+     * Marshalls results to implementations of {@code ZoneService.ZoneMoveListener}.
      */
     public static class ZoneMoveMarshaller extends ListenerMarshaller
         implements ZoneMoveListener