diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index a5413dda7..3e38bb95e 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-21  Dirk Herrmann  <D.Herrmann@tu-bs.de>
+
+	* goops.c (TEST_CHANGE_CLASS, scm_sys_initialize_object): Don't
+	compare SCM values with !=.
+
 2003-04-20  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* eval.c, eval.h, evalext.c, evalext.h (scm_sym_setter,
diff --git a/libguile/goops.c b/libguile/goops.c
index 6eac27ef0..18df9fcdd 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -94,7 +94,7 @@
 #define TEST_CHANGE_CLASS(obj, class)				       \
 	{							       \
 	  class = SCM_CLASS_OF (obj);				       \
-          if (SCM_OBJ_CLASS_REDEF (obj) != SCM_BOOL_F)		       \
+          if (!SCM_FALSEP (SCM_OBJ_CLASS_REDEF (obj)))		       \
 	    {							       \
 	      scm_change_object_class (obj, class, SCM_OBJ_CLASS_REDEF (obj));\
 	      class = SCM_CLASS_OF (obj);			       \
@@ -426,7 +426,7 @@ SCM_DEFINE (scm_sys_initialize_object, "%initialize-object", 2, 0, 0,
 	{
 	  /* set slot to its :init-form if it exists */
 	  tmp = SCM_CADAR (get_n_set);
-	  if (tmp != SCM_BOOL_F)
+	  if (!SCM_FALSEP (tmp))
 	    {
 	      slot_value = get_slot_value (class, obj, SCM_CAR (get_n_set));
 	      if (SCM_GOOPS_UNBOUNDP (slot_value))