diff -ruN klic-3.003-2002-02-20g/include/klic/bb.h klic-3.003-2002-02-22/include/klic/bb.h
--- klic-3.003-2002-02-20g/include/klic/bb.h	Mon Jan 21 20:55:25 2002
+++ klic-3.003-2002-02-22/include/klic/bb.h	Fri Feb 22 09:24:09 2002
@@ -14,19 +14,6 @@
 
 extern q bblt_add_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_add(x, y, z)					\
-do{ (z) = bblt_add_3((x), (y)); }while(0)
-
-#define bblt_add_no_check_x(x, y, z)				\
-do{ bblt_add((x), (y), (z)); }while(0)
-
-#define bblt_add_no_check_y(x, y, z)				\
-do{ bblt_add((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_add(x, y, z)					\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -54,8 +41,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_add_no_check(x, y, z)				\
 do{ (z) = (q) ((unsigned long)(x) + (unsigned long)(y) - INT); }while(0)
 
@@ -65,19 +50,6 @@
 
 extern q bblt_sub_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_sub(x, y, z)					\
-do{ (z) = bblt_sub_3((x), (y)); }while(0)
-
-#define bblt_sub_no_check_x(x, y, z)				\
-do{ bblt_sub((x), (y), (z)); }while(0)
-
-#define bblt_sub_no_check_y(x, y, z)				\
-do{ bblt_sub((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_sub(x, y, z)					\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -105,8 +77,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_sub_no_check(x, y, z)				\
 do{ (z) = (q) ((unsigned long)(x) - ((unsigned long)(y) - INT)); }while(0)
 
@@ -116,19 +86,6 @@
 
 extern q bblt_mult_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_mult(x, y, z)					\
-do{ (z) = bblt_mult_3((x), (y)); }while(0)
-
-#define bblt_mult_no_check_x(x, y, z)				\
-do{ bblt_mult((x), (y), (z)); }while(0)
-
-#define bblt_mult_no_check_y(x, y, z)				\
-do{ bblt_mult((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_mult(x, y, z)					\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -156,8 +113,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_mult_no_check(x, y, z)				\
 do{ (z) = (q) (((long)(x) - INT) * (intval(y)) + INT); }while(0)
 
@@ -167,19 +122,6 @@
 
 extern q bblt_div_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_div(x, y, z)					\
-do{ (z) = bblt_div_3((x), (y)); }while(0)
-
-#define bblt_div_no_check_x(x, y, z)				\
-do{ bblt_div((x), (y), (z)); }while(0)
-
-#define bblt_div_no_check_y(x, y, z)				\
-do{ bblt_div((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_div(x, y, z)					\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -207,8 +149,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_div_no_check(x, y, z)				\
 do{ (z) = makeint(((long)(x) - INT) / ((long)(y) - INT)); }while(0)
 
@@ -218,19 +158,6 @@
 
 extern q bblt_mod_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_mod(x, y, z)					\
-do{ (z) = bblt_mod_3((x), (y)); }while(0)
-
-#define bblt_mod_no_check_x(x, y, z)				\
-do{ bblt_mod((x), (y), (z)); }while(0)
-
-#define bblt_mod_no_check_y(x, y, z)				\
-do{ bblt_mod((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_mod(x, y, z)					\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -258,8 +185,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_mod_no_check(x, y, z)				\
 do{ (z) = (q) (((long)(x) - INT) % ((long)(y) - INT) + INT); }while(0)
 
@@ -269,19 +194,6 @@
 
 extern q bblt_and_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_and(x, y, z)					\
-do{ (z) = bblt_and_3((x), (y)); }while(0)
-
-#define bblt_and_no_check_x(x, y, z)				\
-do{ bblt_and((x), (y), (z)); }while(0)
-
-#define bblt_and_no_check_y(x, y, z)				\
-do{ bblt_and((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_and(x, y, z)					\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -309,8 +221,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_and_no_check(x, y, z)				\
 do{ (z) = (q) ((long)(x) & (long)(y)); }while(0)
 
@@ -320,19 +230,6 @@
 
 extern q bblt_or_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_or(x, y, z)					\
-do{ (z) = bblt_or_3((x), (y)); }while(0)
-
-#define bblt_or_no_check_x(x, y, z)				\
-do{ bblt_or((x), (y), (z)); }while(0)
-
-#define bblt_or_no_check_y(x, y, z)				\
-do{ bblt_or((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_or(x, y, z)					\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -360,8 +257,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_or_no_check(x, y, z)				\
 do{ (z) = (q) ((long)(x) | (long)(y)); }while(0)
 
@@ -371,19 +266,6 @@
 
 extern q bblt_exclusive_or_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_exclusive_or(x, y, z)				\
-do{ (z) = bblt_exclusive_or_3((x), (y)); }while(0)
-
-#define bblt_exclusive_or_no_check_x(x, y, z)			\
-do{ bblt_exclusive_or((x), (y), (z)); }while(0)
-
-#define bblt_exclusive_or_no_check_y(x, y, z)			\
-do{ bblt_exclusive_or((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_exclusive_or(x, y, z)				\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -411,8 +293,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_exclusive_or_no_check(x, y, z)			\
 do{ (z) = (q) (((long)(x) ^ (long)(y)) + INT); }while(0)
 
@@ -422,19 +302,6 @@
 
 extern q bblt_rshift_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_rshift(x, y, z)					\
-do{ (z) = bblt_rshift_3((x), (y)); }while(0)
-
-#define bblt_rshift_no_check_x(x, y, z)				\
-do{ bblt_rshift((x), (y), (z)); }while(0)
-
-#define bblt_rshift_no_check_y(x, y, z)				\
-do{ bblt_rshift((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_rshift(x, y, z)					\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -462,8 +329,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_rshift_no_check(x, y, z)				\
 do{ (z) = makeint(intval(x) >> intval(y)); }while(0)
 
@@ -473,19 +338,6 @@
 
 extern q bblt_lshift_3(q x, q y);
 
-#ifdef COMPACTCODE
-
-#define bblt_lshift(x, y, z)					\
-do{ (z) = bblt_lshift_3((x), (y)); }while(0)
-
-#define bblt_lshift_no_check_x(x, y, z)				\
-do{ bblt_lshift((x), (y), (z)); }while(0)
-
-#define bblt_lshift_no_check_y(x, y, z)				\
-do{ bblt_lshift((x), (y), (z)); }while(0)
-
-#else
-
 #define bblt_lshift(x, y, z)					\
 do{								\
   if (!isint(x) || !isint(y)) {					\
@@ -513,8 +365,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_lshift_no_check(x, y, z)				\
 do{ (z) = (q) ((((long)(x) - INT) << intval(y)) + INT); }while(0)
 
@@ -524,13 +374,6 @@
 
 extern q bblt_complement_2(q x);
 
-#ifdef COMPACTCODE
-
-#define bblt_complement(x, z)					\
-do{ (z) = bblt_complement_2(x); }while(0)
-
-#else
-
 #define bblt_complement(x, z)					\
 do{								\
   if (!isint(x)) {						\
@@ -540,8 +383,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_complement_no_check(x, z)				\
 do{ (z) = (q) ((long)(x) ^ ((-1L) << ATAGBITS)); }while(0)
 
@@ -551,13 +392,6 @@
 
 extern q bblt_plus_2(q x);
 
-#ifdef COMPACTCODE
-
-#define bblt_plus(x, z)						\
-do{ (z) = bblt_plus_2(x); }while(0)
-
-#else
-
 #define bblt_plus(x, z)						\
 do{								\
   if (!isint(x)) {						\
@@ -567,8 +401,6 @@
   }								\
 }while(0)
 
-#endif
-
 #define bblt_plus_no_check(x, z)				\
 do{ (z) = (x); }while(0)
 
@@ -578,13 +410,6 @@
 
 extern q bblt_minus_2(q x);
 
-#ifdef COMPACTCODE
-
-#define bblt_minus(x, z)					\
-do{ (z) = bblt_minus_2(x); }while(0)
-
-#else
-
 #define bblt_minus(x, z)					\
 do{								\
   if (!isint(x)) {						\
@@ -593,8 +418,6 @@
     bblt_minus_no_check((x), (z));				\
   }								\
 }while(0)
-
-#endif
 
 #define bblt_minus_no_check(x, z)				\
 do{ (z) = (q) (2L*INT - (long)(x)); }while(0)
diff -ruN klic-3.003-2002-02-20g/include/klic/unify.h klic-3.003-2002-02-22/include/klic/unify.h
--- klic-3.003-2002-02-20g/include/klic/unify.h	Thu Dec 27 19:15:58 2001
+++ klic-3.003-2002-02-22/include/klic/unify.h	Fri Feb 22 09:25:09 2002
@@ -30,16 +30,6 @@
 #define unify4(x, y, z, w, s, t, u, v) \
 do{ allocp = do_unify4(allocp, (x), (y), (z), (w), (s), (t), (u), (v)); }while(0)
 
-#ifdef COMPACTCODE
-#define unify_value(x, y) \
-do{ allocp = do_unify_value(allocp, (x), (y)); }while(0)
-#define unify_value2(x, y, z, w) \
-do{ allocp = do_unify_value2(allocp, (x), (y), (z), (w) }while(0)
-#define unify_value3(x, y, z, w, s, t) \
-do{ allocp = do_unify_value3(allocp, (x), (y), (z), (w), (s), (t)) }while(0)
-#define unify_value4(x, y, z, w, s, t, u, v) \
-do{ allocp = do_unify_value4(allocp, (x), (y), (z), (w), (s), (t), (u), (v)) }while(0)
-#else
 #define unify_value(x, y)\
 do{								\
   if (!isref(x) || derefone(x) != (x)) {			\
@@ -66,6 +56,5 @@
   unify_value((s), (t));					\
   unify_value((u), (v));					\
 }while(0)
-#endif
 
 #endif /* _KLIC_UNIFY_H_ */