1 files changed, 30 insertions, 30 deletions

diff --git a/src/jvm/clojure/runtime/RestFn5.java b/src/jvm/clojure/runtime/RestFn5.java
index 7b8b414a..6271e0b2 100644
--- a/src/jvm/clojure/runtime/RestFn5.java
+++ b/src/jvm/clojure/runtime/RestFn5.java
@@ -10,64 +10,64 @@
 
 /* rich Mar 27, 2006 8:24:31 PM */
 
-package org.clojure.runtime;
+package clojure.runtime;
 
 public abstract class RestFn5 extends AFn{
 
-protected abstract Object doInvoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
-                                   Cons rest)
+protected abstract Object doInvoke( Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+                                   ISeq rest)
 		throws Exception;
 
-public Object applyTo(ThreadLocalData tld, Cons arglist) throws Exception
+public Object applyTo( ISeq arglist) throws Exception
 	{
     switch(RT.boundedLength(arglist, 5))
         {
         case 0:
-            return invoke(tld);
+            return invoke();
         case 1:
-            return invoke(tld,arglist.first);
+            return invoke(arglist.first());
         case 2:
-            return invoke(tld,arglist.first
-                    , (arglist = arglist.rest).first
+            return invoke(arglist.first()
+                    , (arglist = arglist.rest()).first()
             );
         case 3:
-            return invoke(tld,arglist.first
-                    , (arglist = arglist.rest).first
-                    , (arglist = arglist.rest).first
+            return invoke(arglist.first()
+                    , (arglist = arglist.rest()).first()
+                    , (arglist = arglist.rest()).first()
             );
         case 4:
-            return invoke(tld,arglist.first
-                    , (arglist = arglist.rest).first
-                    , (arglist = arglist.rest).first
-                    , (arglist = arglist.rest).first
+            return invoke(arglist.first()
+                    , (arglist = arglist.rest()).first()
+                    , (arglist = arglist.rest()).first()
+                    , (arglist = arglist.rest()).first()
             );
         case 5:
-            return invoke(tld,arglist.first
-                    , (arglist = arglist.rest).first
-                    , (arglist = arglist.rest).first
-                    , (arglist = arglist.rest).first
-                    , (arglist = arglist.rest).first
+            return invoke(arglist.first()
+                    , (arglist = arglist.rest()).first()
+                    , (arglist = arglist.rest()).first()
+                    , (arglist = arglist.rest()).first()
+                    , (arglist = arglist.rest()).first()
             );
         default:
-    	    return doInvoke(tld, arglist.first
-                , (arglist = arglist.rest).first
-                    , (arglist = arglist.rest).first
-                    , (arglist = arglist.rest).first
-                    , (arglist = arglist.rest).first
-			, arglist.rest);
+    	    return doInvoke( arglist.first()
+                , (arglist = arglist.rest()).first()
+                    , (arglist = arglist.rest()).first()
+                    , (arglist = arglist.rest()).first()
+                    , (arglist = arglist.rest()).first()
+			, arglist.rest());
 
         }
 	}
 
-public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5)
+public Object invoke( Object arg1, Object arg2, Object arg3, Object arg4, Object arg5)
 		throws Exception
 	{
-	return doInvoke(tld, arg1, arg2, arg3, arg4, arg5, null);
+	return doInvoke( arg1, arg2, arg3, arg4, arg5, null);
 	}
 
-public Object invoke(ThreadLocalData tld, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Cons args)
+public Object invoke( Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, ISeq args)
 		throws Exception
 	{
-	return doInvoke(tld, arg1, arg2, arg3, arg4, arg5, args);
+	return doInvoke( arg1, arg2, arg3, arg4, arg5, args);
 	}
 }