diff --git a/lisp/alpha-arch.c b/lisp/alpha-arch.c
index d526a6dbe10b0811d3661e41811b40758fb29167..931ceebf821f05158a13144a92c2073537335154 100644
--- a/lisp/alpha-arch.c
+++ b/lisp/alpha-arch.c
@@ -1,6 +1,6 @@
 /*
 
- $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/alpha-arch.c,v 1.9 2007/01/01 11:53:02 cshapiro Exp $
+ $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/alpha-arch.c,v 1.10 2007/11/16 06:52:25 cshapiro Exp $
 
  This code was written as part of the CMU Common Lisp project at
  Carnegie Mellon University, and has been placed in the public domain.
@@ -318,8 +318,6 @@ sigtrap_handler(int signal, int code, struct sigcontext *scp)
     }
 }
 
-#define FIXNUM_VALUE(lispobj) (((int)lispobj)>>2)
-
 static void
 sigfpe_handler(int signal, int code, struct sigcontext *scp)
 {
diff --git a/lisp/amd64-arch.c b/lisp/amd64-arch.c
index 6fc80ecd3bd6f3107f24a2eca2c631bab3d136b9..6fbcd93165d7f21ea196e08f877e44217b3fcfd3 100644
--- a/lisp/amd64-arch.c
+++ b/lisp/amd64-arch.c
@@ -1,6 +1,6 @@
 /* x86-arch.c -*- Mode: C; comment-column: 40 -*-
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/amd64-arch.c,v 1.5 2007/11/16 05:04:09 cshapiro Exp $ 
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/amd64-arch.c,v 1.6 2007/11/16 06:52:25 cshapiro Exp $ 
  *
  */
 
@@ -314,8 +314,6 @@ sigtrap_handler(HANDLER_ARGS)
     }
 }
 
-#define FIXNUM_VALUE(lispobj) (((int) lispobj) >> 2)
-
 void
 arch_install_interrupt_handlers()
 {
diff --git a/lisp/mips-arch.c b/lisp/mips-arch.c
index b0f13f3ab47b5cc89bd32b0e6abd83cc41e21749..c694ecd5b75d9face8843f31d55c958e454d1762 100644
--- a/lisp/mips-arch.c
+++ b/lisp/mips-arch.c
@@ -1,6 +1,6 @@
 /*
 
- $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/mips-arch.c,v 1.10 2005/09/15 18:26:52 rtoy Exp $
+ $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/mips-arch.c,v 1.11 2007/11/16 06:52:25 cshapiro Exp $
 
  This code was written as part of the CMU Common Lisp project at
  Carnegie Mellon University, and has been placed in the public domain.
@@ -257,8 +257,6 @@ sigtrap_handler(int signal, int code, struct sigcontext *scp)
     }
 }
 
-#define FIXNUM_VALUE(lispobj) (((int)lispobj)>>2)
-
 static void
 sigfpe_handler(int signal, int code, struct sigcontext *scp)
 {
@@ -293,15 +291,15 @@ sigfpe_handler(int signal, int code, struct sigcontext *scp)
 		    return;
 		}
 		result =
-		    FIXNUM_VALUE(scp->sc_regs[rs]) +
-		    FIXNUM_VALUE(scp->sc_regs[rt]);
+		    fixnum_value(scp->sc_regs[rs]) +
+		    fixnum_value(scp->sc_regs[rt]);
 		dest = rd;
 		break;
 
 	    case 0x22:		/* SUB */
 		result =
-		    FIXNUM_VALUE(scp->sc_regs[rs]) -
-		    FIXNUM_VALUE(scp->sc_regs[rt]);
+		    fixnum_value(scp->sc_regs[rs]) -
+		    fixnum_value(scp->sc_regs[rt]);
 		dest = rd;
 		break;
 
@@ -312,7 +310,7 @@ sigfpe_handler(int signal, int code, struct sigcontext *scp)
 	  break;
 
       case 0x8:		/* ADDI */
-	  result = FIXNUM_VALUE(scp->sc_regs[rs]) + (immed >> 2);
+	  result = fixnum_value(scp->sc_regs[rs]) + (immed >> 2);
 	  dest = rt;
 	  break;
 
diff --git a/lisp/x86-arch.c b/lisp/x86-arch.c
index 66eb08f188cc4e4f90e00407334408cf854d091f..d511a4d4c15ea48e71e5b367b2d5c342a9f00e74 100644
--- a/lisp/x86-arch.c
+++ b/lisp/x86-arch.c
@@ -1,6 +1,6 @@
 /* x86-arch.c -*- Mode: C; comment-column: 40 -*-
  *
- * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/x86-arch.c,v 1.29 2007/11/16 05:04:09 cshapiro Exp $ 
+ * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/x86-arch.c,v 1.30 2007/11/16 06:52:25 cshapiro Exp $ 
  *
  */
 
@@ -290,8 +290,6 @@ sigtrap_handler(HANDLER_ARGS)
     }
 }
 
-#define FIXNUM_VALUE(lispobj) (((int) lispobj) >> 2)
-
 void
 arch_install_interrupt_handlers()
 {