diff --git a/inc/eqfdefs.h b/inc/eqfdefs.h
index 233dd3a..8389c33 100644
--- a/inc/eqfdefs.h
+++ b/inc/eqfdefs.h
@@ -1,8 +1,8 @@
 #ifndef EQFDEFS_H
 #define EQFDEFS_H 1
 #include "lispemul.h" /* for LispPTR */
-LispPTR N_OP_clequal(int arg1, int arg2);
-LispPTR N_OP_eqlop(int arg1, int arg2);
-LispPTR N_OP_equal(int arg1, int arg2);
-LispPTR N_OP_eqq(int arg1, int arg2);
+LispPTR N_OP_clequal(LispPTR arg1, LispPTR arg2);
+LispPTR N_OP_eqlop(LispPTR arg1, LispPTR arg2);
+LispPTR N_OP_equal(LispPTR arg1, LispPTR arg2);
+LispPTR N_OP_eqq(LispPTR arg1, LispPTR arg2);
 #endif
diff --git a/inc/lsptypes.h b/inc/lsptypes.h
index 7693566..2a8573e 100644
--- a/inc/lsptypes.h
+++ b/inc/lsptypes.h
@@ -631,6 +631,7 @@ typedef struct
 /* This MACRO is similar to LISTP */
 #define Listp(address)	(GetTypeNumber(address) == TYPE_LISTP)
 
+#define Numberp(address) (GetTypeEntry(address) & TT_NUMBERP)
 
 	/******************************************/
 	/*        Lisp's PATHNAME datatype        */
diff --git a/inc/my.h b/inc/my.h
index b198f34..a55de8b 100644
--- a/inc/my.h
+++ b/inc/my.h
@@ -26,13 +26,6 @@
 #include "lsptypes.h"    // for GETBYTE, GETWORD, GetTypeNumber, TYPE_FLOATP
 #include "mkcelldefs.h"  // for createcell68k
 
-#ifdef BIGVM
-#define IsNumber(address)     ((GETWORD(MDStypetbl +(((address) & 0x0fffff00)>>9))) & 0x1000)
-#else
-#define IsNumber(address)     ((GETWORD(MDStypetbl +(((address) & 0x0ffff00)>>9))) & 0x1000)
-#endif
-
-
 /************************************************************************/
 /*									*/
 /*			N _ M a k e F l o a t				*/
diff --git a/src/eqf.c b/src/eqf.c
index 0f73755..c018cd5 100644
--- a/src/eqf.c
+++ b/src/eqf.c
@@ -23,7 +23,7 @@
 #include "lispmap.h"   // for ATOM_OFFSET, S_CHARACTER, S_NEGATIVE, S_POSITIVE
 #include "lspglob.h"
 #include "lsptypes.h"  // for TYPE_FLOATP, GetTypeNumber, TYPE_FIXP, TYPE_SM...
-#include "my.h"        // for IsNumber, N_MakeFloat
+#include "my.h"        // for N_MakeFloat
 
 /************************************************************
 op 072   N_OP_eqlop	EQL
@@ -79,7 +79,7 @@ BIGNUM  (integer that can't be represented bigger than 32 bits)
 /*									*/
 /************************************************************************/
 
-LispPTR N_OP_clequal(int arg1, int arg2) {
+LispPTR N_OP_clequal(LispPTR arg1, LispPTR arg2) {
   int type;
 
   if (arg2 == arg1) return (ATOM_T);
@@ -91,10 +91,10 @@ LispPTR N_OP_clequal(int arg1, int arg2) {
 
   /* can return NIL if one is a number and the other isn't */
 
-  if (IsNumber(arg1)) {
-    if (!IsNumber(arg2)) return (NIL);
+  if (Numberp(arg1)) {
+    if (!Numberp(arg2)) return (NIL);
   } else {
-    if (IsNumber(arg2)) {
+    if (Numberp(arg2)) {
       return (NIL);
     } else
       ERROR_EXIT(arg2);
@@ -128,7 +128,7 @@ LispPTR N_OP_clequal(int arg1, int arg2) {
 /*									*/
 /************************************************************************/
 
-LispPTR N_OP_eqlop(int arg1, int arg2) {
+LispPTR N_OP_eqlop(LispPTR arg1, LispPTR arg2) {
   int type;
 
   if (arg2 == arg1) return (ATOM_T);
@@ -153,7 +153,7 @@ LispPTR N_OP_eqlop(int arg1, int arg2) {
       return (NIL);
 
     default:
-      if (IsNumber(arg1)) {
+      if (Numberp(arg1)) {
         ERROR_EXIT(arg2);
       } else
         return (NIL);
@@ -169,7 +169,7 @@ LispPTR N_OP_eqlop(int arg1, int arg2) {
 /*									*/
 /************************************************************************/
 
-LispPTR N_OP_equal(int arg1, int arg2) {
+LispPTR N_OP_equal(LispPTR arg1, LispPTR arg2) {
   int type, type2;
 
   if (arg2 == arg1) return (ATOM_T);
@@ -183,10 +183,10 @@ arg1_small:
 
 arg2_small:
 
-  if (IsNumber(arg1)) {
-    if (!IsNumber(arg2)) return (NIL);
+  if (Numberp(arg1)) {
+    if (!Numberp(arg2)) return (NIL);
   } else {
-    if (IsNumber(arg2)) {
+    if (Numberp(arg2)) {
       return (NIL);
     } else
       ERROR_EXIT(arg2);
@@ -232,7 +232,7 @@ arg2_small:
 /*									*/
 /************************************************************************/
 
-LispPTR N_OP_eqq(int arg1, int arg2) /* CL:=    opcode 0377 */
+LispPTR N_OP_eqq(LispPTR arg1, LispPTR arg2) /* CL:=    opcode 0377 */
 
 {
   int type1, type2;