--- a/src/bytecode.c	Tue Feb 22 22:56:02 2011 +0100
+++ b/src/bytecode.c	Thu Mar 17 23:42:59 2011 +0100
@@ -1690,6 +1690,8 @@
 	break;
       }
 
+#ifdef SUPPORT_CONFOUNDING_FUNCTIONS
+
     case Bold_eq:
       {
 	Lisp_Object arg = POP;
@@ -1725,6 +1727,8 @@
 	break;
       }
 
+#endif
+
     case Bbind_multiple_value_limits:
       {
         Lisp_Object upper = POP, first = TOP, speccount;
@@ -1959,11 +1963,14 @@
 	    wtaerror ("attempt to set non-symbol", val);
 	  if (EQ (val, Qnil) || EQ (val, Qt))
 	    signal_error (Qsetting_constant, 0, val);
+#ifdef NEED_TO_HANDLE_21_4_CODE
 	  /* Ignore assignments to keywords by converting to Bdiscard.
-	     For backward compatibility only - we'd like to make this an error.  */
+	     For backward compatibility only - we'd like to make this an
+	     error.  */
 	  if (SYMBOL_IS_KEYWORD (val))
 	    REWRITE_OPCODE (Bdiscard);
 	  else
+#endif
 	    WRITE_NARGS (Bvarset);
 	  break;