diff -ruN klic-3.003-2002-02-08a/include/klic/functorstuffs.h klic-3.003-2002-02-08b/include/klic/functorstuffs.h
--- klic-3.003-2002-02-08a/include/klic/functorstuffs.h	Fri Feb  8 14:47:07 2002
+++ klic-3.003-2002-02-08b/include/klic/functorstuffs.h	Fri Feb  8 15:40:09 2002
@@ -14,8 +14,7 @@
 extern unsigned long functors(unsigned long id);
 extern unsigned long arities(unsigned long id);
 
-#define FUNCTORNUMBERBASE 0
-#define functoratom(f)  (functors (symval(f) - FUNCTORNUMBERBASE))
-#define arityof(f)  (arities (symval(f) - FUNCTORNUMBERBASE))
+#define functoratom(f)  (functors (symval (f)))
+#define arityof(f)  (arities (symval (f)))
 
 #endif /* _KLIC_FUNCTORSTUFFS_H_ */
diff -ruN klic-3.003-2002-02-08a/include/klic/gd_macro.h klic-3.003-2002-02-08b/include/klic/gd_macro.h
--- klic-3.003-2002-02-08a/include/klic/gd_macro.h	Fri Feb  8 14:47:07 2002
+++ klic-3.003-2002-02-08b/include/klic/gd_macro.h	Fri Feb  8 15:40:31 2002
@@ -9,7 +9,7 @@
 #define _KLIC_GD_MACRO_H_
 
 #include <klic/stdc.h>  /* CONCATENATE */
-#include <klic/functorstuffs.h>  /* functor, arity, FUNCTORNUMBERBASE */
+#include <klic/functorstuffs.h>  /* functors, arities */
 #include <klic/basic.h>  /* fatal, klic_fprintf, klic_putc */
 
 /* runtime/unify2.c */
@@ -297,7 +297,7 @@
   default: fatal("undefined method")
 
 #define GD_SWITCH_ON_GMETHOD_NAME \
-  switch (functors (g_method_functor - FUNCTORNUMBERBASE))
+  switch (functors (g_method_functor))
 
 #define GD_METHOD_NAME_CASE(sym) \
  case ((long)(G_atom(sym))) : \
diff -ruN klic-3.003-2002-02-08a/runtime/datamsg.c klic-3.003-2002-02-08b/runtime/datamsg.c
--- klic-3.003-2002-02-08a/runtime/datamsg.c	Fri Feb  8 13:33:35 2002
+++ klic-3.003-2002-02-08b/runtime/datamsg.c	Fri Feb  8 15:40:09 2002
@@ -20,8 +20,8 @@
 #include <klic/struct.h>
 #include <klic/primitives.h>
 #include <klic/unify.h>
-#include <klic/atomstuffs.h>  /* ATOMNUMBERBASE */
-#include <klic/functorstuffs.h>   /* arityof, FUNCTORNUMBERBASE */
+#include <klic/atomstuffs.h>
+#include <klic/functorstuffs.h>   /* arityof */
 #include "timing.h"
 
 #include <klic/gb.h>
@@ -218,7 +218,7 @@
 	  }
 	}
       } else {      /* functor */
-	if(symval(f) - FUNCTORNUMBERBASE >= initial_functors){
+	if(symval(f) >= initial_functors){
 	  ioeprintf("initial_functors %d\nsymval(data) %d\n",
 		    initial_functors, symval(f));
 	  fatal("cannot send a newly created functor in this version.");
diff -ruN klic-3.003-2002-02-08a/runtime/debug.c klic-3.003-2002-02-08b/runtime/debug.c
--- klic-3.003-2002-02-08a/runtime/debug.c	Fri Feb  8 14:47:07 2002
+++ klic-3.003-2002-02-08b/runtime/debug.c	Fri Feb  8 15:40:09 2002
@@ -19,7 +19,7 @@
 #include <klic/unify.h>
 #include <klic/index.h>
 #include <klic/atomstuffs.h>  /* atomname */
-#include <klic/functorstuffs.h>  /* functor, arity, FUNCTORNUMBERBASE */
+#include <klic/functorstuffs.h>  /* functors, arities */
 
 #ifdef DIST
 #include <klic/distio.h>
@@ -290,11 +290,11 @@
       case 'F':
 	fprintf_func(out, "%s/%d",
 #ifdef DEBUGLIB
-		atomname (functors (*argp - FUNCTORNUMBERBASE)),
+		atomname (functors (*argp)),
 #else
 		"???",
 #endif
-		arities (*argp -FUNCTORNUMBERBASE) );
+		arities (*argp) );
 	argp++;
 	break;
       default:
diff -ruN klic-3.003-2002-02-08a/runtime/gcode.c klic-3.003-2002-02-08b/runtime/gcode.c
--- klic-3.003-2002-02-08a/runtime/gcode.c	Fri Feb  8 14:47:07 2002
+++ klic-3.003-2002-02-08b/runtime/gcode.c	Fri Feb  8 15:40:09 2002
@@ -17,7 +17,7 @@
 #include <klic/gdobject.h>
 #include <klic/predinfo.h>
 #include "atom.h"
-#include "funct.h"  /* arities, arityof, FUNCTORNUMBERBASE */
+#include "funct.h"  /* arities */
 #include <klic/gmodule.h>
 
 #define GD_CLASS_NAME() predicate
@@ -130,7 +130,7 @@
   GD_RETURN;
 }
 
-#define GD_METHOD_ARITY  arities (g_method_functor - FUNCTORNUMBERBASE)
+#define GD_METHOD_ARITY  arities (g_method_functor)
 
 GDDEF_METHOD(call)
 {
diff -ruN klic-3.003-2002-02-08a/runtime/generic.c klic-3.003-2002-02-08b/runtime/generic.c
--- klic-3.003-2002-02-08a/runtime/generic.c	Fri Feb  8 14:47:07 2002
+++ klic-3.003-2002-02-08b/runtime/generic.c	Fri Feb  8 15:40:09 2002
@@ -8,7 +8,7 @@
 /* G_error, fatal, fatalf, debug_printf, klic_fprintf */
 #include <klic/gdobject.h>
 
-#include <klic/functorstuffs.h>  /* arities, FUNCTORNUMBERBASE */
+#include <klic/functorstuffs.h>  /* arities */
 #include <klic/atomstuffs.h>
 #include <stdio.h>
 #include <klic/gd_macro.h>
@@ -47,7 +47,7 @@
   q* g_allocp;
 {
   G_STD_DECL;
-  unsigned long argc = arities (method_functor - FUNCTORNUMBERBASE);
+  unsigned long argc = arities (method_functor);
   q objp;
   int i;
 
diff -ruN klic-3.003-2002-02-08a/runtime/newatom.c klic-3.003-2002-02-08b/runtime/newatom.c
--- klic-3.003-2002-02-08a/runtime/newatom.c	Fri Feb  8 14:51:35 2002
+++ klic-3.003-2002-02-08b/runtime/newatom.c	Fri Feb  8 15:40:09 2002
@@ -10,8 +10,8 @@
 #include <klic/primitives.h>  /* malloc_check */
 #include <klic/unify.h>
 #include <klic/index.h>
-#include <klic/atomstuffs.h>  /* ATOMNUMBERBASE */
-#include <klic/functorstuffs.h>  /* functors, arities, FUNCTORNUMBERBASE */
+#include <klic/atomstuffs.h>  /* atomname */
+#include <klic/functorstuffs.h>  /* functors, arities */
 #include <klic/newatom.h>
 
 #ifdef SHM
@@ -357,7 +357,7 @@
 #ifdef SHM
 	s_unlock(f_key());
 #endif
-	return functhp->functorid + FUNCTORNUMBERBASE;
+	return functhp->functorid;
       }else{
 	index = index0;
       }
@@ -366,7 +366,7 @@
 #ifdef SHM
     s_unlock(f_key());
 #endif
-    return index + FUNCTORNUMBERBASE;
+    return index;
   }else{
     if( functhp->functorid +1 == functhp->functortablesize ){
       goto expand;
@@ -381,7 +381,7 @@
 #ifdef SHM
     s_unlock(f_key());
 #endif
-    return functhp->functorid + FUNCTORNUMBERBASE;
+    return functhp->functorid;
   }
 
  expand: