Index: /branches/rme-logops/compiler/nx0.lisp
===================================================================
--- /branches/rme-logops/compiler/nx0.lisp	(revision 13885)
+++ /branches/rme-logops/compiler/nx0.lisp	(revision 13886)
@@ -2740,14 +2740,4 @@
     (subtypep (nx-form-type arg env) type env)))
 
-(defun nx-fixnum-op-p (form env)
-  (target-word-size-case
-   (32 (nx-form-typep form '(signed-byte 30) env))
-   (64 (nx-form-typep form '(signed-byte 61) env))))
-
-(defun nx-natural-op-p (form env)
-  (target-word-size-case
-   (32 (nx-form-typep form '(unsigned-byte 32) env))
-   (64 (nx-form-typep form '(unsigned-byte 64) env))))
-
 (defun nx-binary-fixnum-op-p (form1 form2 env &optional ignore-result-type)
   (setq form1 (nx-transform form1 env)
@@ -2783,10 +2773,10 @@
 
 (defun nx-logand-2-op (arg-1 arg-2 env)
-  (let ((fix-1 (nx-fixnum-op-p arg-1 env))
-	(fix-2 (nx-fixnum-op-p arg-2 env))
-	(nat-1 (nx-natural-op-p arg-1 env))
-	(nat-2 (nx-natural-op-p arg-2 env))
-	(form-1 (nx1-form arg-1))
-	(form-2 (nx1-form arg-2)))
+  (let* ((form-1 (nx1-form arg-1))
+	 (form-2 (nx1-form arg-2))
+	 (fix-1 (nx-acode-fixnum-type-p form-1 env))
+	 (fix-2 (nx-acode-fixnum-type-p form-2 env))
+	 (nat-1 (nx-acode-natural-type-p form-1 env))
+	 (nat-2 (nx-acode-natural-type-p form-2 env)))
     (cond
       ((and fix-1 fix-2)