diff -ruN klic-3.003-2002-02-18b/include/klic/g_methtab.h klic-3.003-2002-02-18c/include/klic/g_methtab.h
--- klic-3.003-2002-02-18b/include/klic/g_methtab.h	Tue Jan 15 17:54:58 2002
+++ klic-3.003-2002-02-18c/include/klic/g_methtab.h	Mon Feb 18 16:21:18 2002
@@ -32,7 +32,7 @@
 		    unsigned long length */ );
   q *(*gc)( /* struct data_object *obj, q *allocp , q **sp */ );
   long (*regist)( /* struct data_object *obj */ );
-  q* (*deallocate)( /* struct data_object *obj, q* allocp */ );
+  void (*deallocate)( /* struct data_object* obj */ );
   q *(*close)( /* struct data_object *obj, */ );
   q *(*body_generic)( /* struct data_object *obj,
 				      q method_functor,
@@ -70,7 +70,7 @@
 		  unsigned long max_length */);
   q *(*gc)(/* struct consumer_object *obj, q *allocp, q **sp */);
   long (*regist)(/* struct consumer_object *obj */ );
-  q* (*deallocate)( /* struct consumer_object *obj, q* allocp */ );
+  void (*deallocate)( /* struct consumer_object* obj */ );
   q *(*close)( /* struct consumer_object *obj */ );
   q (*encode)(/* struct consumer_object *obj, long node */);
 };
@@ -98,7 +98,7 @@
 	       q* allocp,
 	       q** sp */);
   long (*regist)(/* struct generator_object* self */);
-  q* (*deallocate)(/* struct generator_object* self, q* allocp */);
+  void (*deallocate)(/* struct generator_object* self */);
   q* (*close)(/* struct generator_object* self */);
   q (*encode)(/* struct generator_object* self, long node */);
 };
diff -ruN klic-3.003-2002-02-18b/include/klic/gc_macro.h klic-3.003-2002-02-18c/include/klic/gc_macro.h
--- klic-3.003-2002-02-18b/include/klic/gc_macro.h	Sun Feb 17 17:21:02 2002
+++ klic-3.003-2002-02-18c/include/klic/gc_macro.h	Mon Feb 18 16:21:34 2002
@@ -435,10 +435,9 @@
     q *g_allocp;
 
 #define GCDEF_DEALLOCATE() \
-  static q* \
-  GC_rappend(deallocate) (GC_SELF, g_allocp) \
-    GC_OBJ_TYPE *GC_SELF; \
-    q* g_allocp;
+  static void \
+  GC_rappend(deallocate) (GC_SELF) \
+    GC_OBJ_TYPE* GC_SELF;
 
 #define GCDEF_CLOSE() \
   static q * \
diff -ruN klic-3.003-2002-02-18b/include/klic/gc_methtab.h klic-3.003-2002-02-18c/include/klic/gc_methtab.h
--- klic-3.003-2002-02-18b/include/klic/gc_methtab.h	Tue Jan 15 10:43:40 2002
+++ klic-3.003-2002-02-18c/include/klic/gc_methtab.h	Mon Feb 18 16:19:03 2002
@@ -14,7 +14,7 @@
 
 /* runtime/generic.c */
 extern long GD_STD_REGIST(struct data_object* GD_SELF, q* g_allocp);
-extern q* GD_STD_DEALLOCATE(struct data_object* GD_SELF, q* g_allocp);
+extern void GD_STD_DEALLOCATE(struct data_object* GD_SELF);
 extern q* GD_STD_CLOSE(struct data_object* GD_SELF, q* g_allocp);
 extern q GD_STD_ENCODE(struct data_object* self, void* buffer);
 
diff -ruN klic-3.003-2002-02-18b/include/klic/gd_macro.h klic-3.003-2002-02-18c/include/klic/gd_macro.h
--- klic-3.003-2002-02-18b/include/klic/gd_macro.h	Sun Feb 17 17:21:54 2002
+++ klic-3.003-2002-02-18c/include/klic/gd_macro.h	Mon Feb 18 16:21:58 2002
@@ -408,10 +408,9 @@
     q *g_allocp;
 
 #define GDDEF_DEALLOCATE() \
-  static q* \
-  GD_rappend(deallocate) (GD_SELF, g_allocp) \
-    GD_OBJ_TYPE * GD_SELF; \
-    q* g_allocp;
+  static void \
+  GD_rappend(deallocate) (GD_SELF) \
+    GD_OBJ_TYPE* GD_SELF;
 
 #define GDDEF_CLOSE() \
   static q * \
diff -ruN klic-3.003-2002-02-18b/include/klic/gd_methtab.h klic-3.003-2002-02-18c/include/klic/gd_methtab.h
--- klic-3.003-2002-02-18b/include/klic/gd_methtab.h	Tue Jan 15 10:44:42 2002
+++ klic-3.003-2002-02-18c/include/klic/gd_methtab.h	Mon Feb 18 16:19:44 2002
@@ -23,7 +23,7 @@
 
 extern q* GD_STD_GC(struct data_object* GD_SELF, q* g_allocp, q** g_sp);
 extern long GD_STD_REGIST(struct data_object* GD_SELF, q* g_allocp);
-extern q* GD_STD_DEALLOCATE(struct data_object* GD_SELF, q* g_allocp);
+extern void GD_STD_DEALLOCATE(struct data_object* GD_SELF);
 extern q* GD_STD_CLOSE(struct data_object* GD_SELF, q* g_allocp);
 
 extern q* GD_STD_GENERIC(
diff -ruN klic-3.003-2002-02-18b/include/klic/gg_macro.h klic-3.003-2002-02-18c/include/klic/gg_macro.h
--- klic-3.003-2002-02-18b/include/klic/gg_macro.h	Sun Feb 17 17:22:33 2002
+++ klic-3.003-2002-02-18c/include/klic/gg_macro.h	Mon Feb 18 16:20:13 2002
@@ -284,10 +284,9 @@
     q *g_allocp;
 
 #define GGDEF_DEALLOCATE() \
-  static q* \
-  GG_rappend(deallocate) (GG_SELF, g_allocp) \
-    GG_OBJ_TYPE *GG_SELF; \
-    q* g_allocp;
+  static void \
+  GG_rappend(deallocate) (GG_SELF) \
+    GG_OBJ_TYPE* GG_SELF;
 
 #define GGDEF_CLOSE() \
   static q * \
diff -ruN klic-3.003-2002-02-18b/include/klic/gg_methtab.h klic-3.003-2002-02-18c/include/klic/gg_methtab.h
--- klic-3.003-2002-02-18b/include/klic/gg_methtab.h	Tue Jan 15 17:56:36 2002
+++ klic-3.003-2002-02-18c/include/klic/gg_methtab.h	Mon Feb 18 16:20:31 2002
@@ -15,7 +15,7 @@
 
 /* runtime/generic.c */
 extern long GD_STD_REGIST(struct data_object* GD_SELF, q* g_allocp);
-extern q* GD_STD_DEALLOCATE(struct data_object* GD_SELF, q* g_allocp);
+extern void GD_STD_DEALLOCATE(struct data_object* GD_SELF);
 extern q* GD_STD_CLOSE(struct data_object* GD_SELF, q* g_allocp);
 extern q GD_STD_ENCODE(struct data_object* self, void* buffer);
 
diff -ruN klic-3.003-2002-02-18b/runtime/otbl.c klic-3.003-2002-02-18c/runtime/otbl.c
--- klic-3.003-2002-02-18b/runtime/otbl.c	Tue Jan 15 10:39:47 2002
+++ klic-3.003-2002-02-18c/runtime/otbl.c	Mon Feb 18 16:24:04 2002
@@ -18,8 +18,7 @@
 
 #define OTBLBLKSIZE 100
 
-#define generic_deallocate(obj, allocp) \
-  (obj)->method_table->deallocate(obj, allocp)
+#define generic_deallocate(obj)  (obj)->method_table->deallocate(obj)
 
 struct object_table {
   unsigned int type;
@@ -77,13 +76,13 @@
     if( !isstruct(newplace) ){  /* the object is garbage */
       switch( tbl->type ){
       case G_DATA:
-	allocp = generic_deallocate(obj, allocp);
+	generic_deallocate(obj);
 	break;
       case G_CONSUMER:
-	allocp = generic_deallocate((struct consumer_object*) obj, allocp);
+	generic_deallocate((struct consumer_object*) obj);
 	break;
       case G_GENERATOR:
-	allocp = generic_deallocate((struct generator_object*) obj, allocp);
+	generic_deallocate((struct generator_object*) obj);
 	break;
       default:
 	fatal("Called deallocate method for unknown type generic object\n");
diff -ruN klic-3.003-2002-02-18b/runtime/print.c klic-3.003-2002-02-18c/runtime/print.c
--- klic-3.003-2002-02-18b/runtime/print.c	Fri Feb  8 13:39:04 2002
+++ klic-3.003-2002-02-18c/runtime/print.c	Mon Feb 18 16:09:56 2002
@@ -171,7 +171,7 @@
 
 extern void
 general_print(a, stream, depth, length)
-  q* a;
+  q a;
   FILE* stream;
   unsigned long depth, length;
 {