diff --git a/src/java/com/samskivert/util/BasicRunQueue.java b/src/java/com/samskivert/util/BasicRunQueue.java
index a64f0a38..c87f8aea 100644
--- a/src/java/com/samskivert/util/BasicRunQueue.java
+++ b/src/java/com/samskivert/util/BasicRunQueue.java
@@ -17,7 +17,7 @@ public class BasicRunQueue extends LoopingThread
     public BasicRunQueue ()
     {
         super("RunQueue");
-        _queue = new Queue();
+        _queue = new Queue<Runnable>();
     }
     
     // documentation inherited from interface
@@ -35,7 +35,7 @@ public class BasicRunQueue extends LoopingThread
     // documentation inherited
     protected void iterate ()
     {
-        Runnable r = (Runnable) _queue.get();
+        Runnable r = _queue.get();
         try {
             r.run();
 
@@ -56,5 +56,5 @@ public class BasicRunQueue extends LoopingThread
     }
 
     /** The queue of things to run. */
-    protected Queue _queue;
+    protected Queue<Runnable> _queue;
 }
diff --git a/src/java/com/samskivert/util/Invoker.java b/src/java/com/samskivert/util/Invoker.java
index 76410a9f..7c7fac3d 100644
--- a/src/java/com/samskivert/util/Invoker.java
+++ b/src/java/com/samskivert/util/Invoker.java
@@ -116,7 +116,7 @@ public class Invoker extends LoopingThread
     public void iterate ()
     {
         // pop the next item off of the queue
-        Unit unit = (Unit) _queue.get();
+        Unit unit = _queue.get();
 
         long start;
         if (PERF_TRACK) {
@@ -226,7 +226,7 @@ public class Invoker extends LoopingThread
     }
 
     /** The invoker's queue of units to be executed. */
-    protected Queue _queue = new Queue();
+    protected Queue<Unit> _queue = new Queue<Unit>();
 
     /** The result receiver with which we're working. */
     protected RunQueue _receiver;