diff --git a/src/backend.cmod b/src/backend.cmod
index 15e3bb83af445088301fbda7e3dab3f1c783569b..6625f34313b9228e284464613aa17efc7d54968f 100644
--- a/src/backend.cmod
+++ b/src/backend.cmod
@@ -2,11 +2,11 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: backend.cmod,v 1.40 2003/03/30 12:44:00 grubba Exp $
+|| $Id: backend.cmod,v 1.41 2003/03/30 20:44:19 mast Exp $
 */
 
 #include "global.h"
-RCSID("$Id: backend.cmod,v 1.40 2003/03/30 12:44:00 grubba Exp $");
+RCSID("$Id: backend.cmod,v 1.41 2003/03/30 20:44:19 mast Exp $");
 #include "fdlib.h"
 #include "backend.h"
 #include <errno.h>
@@ -2107,9 +2107,6 @@ PMOD_EXPORT int write_to_stderr(char *a, size_t len)
 #define WRAP(CB)							    \
 void PIKE_CONCAT(set_,CB)(int fd,file_callback cb,void *data)		    \
 {									    \
-  if (!default_backend && !cb && !data && !get_backend_for_fd(fd)) {	    \
-    return;								    \
-  }									    \
   PIKE_CONCAT(backend_set_,CB)(really_get_backend_for_fd(fd),fd,cb, data);  \
 }									    \
 									    \
diff --git a/src/pike_threadlib.h b/src/pike_threadlib.h
index 717c5bc557e6e032ffa54f171eb0ab4bee94f3c4..d49f2dbc6b13a05f605a3b9b0df52c504e20b0c2 100644
--- a/src/pike_threadlib.h
+++ b/src/pike_threadlib.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: pike_threadlib.h,v 1.34 2003/03/30 13:09:51 grubba Exp $
+|| $Id: pike_threadlib.h,v 1.35 2003/03/30 20:44:19 mast Exp $
 */
 
 #ifndef PIKE_THREADLIB_H
@@ -659,7 +659,7 @@ PMOD_EXPORT extern int Pike_in_gc;
 
 #define THREADS_DISALLOW() \
      REVEAL_GLOBAL_VARIABLES(); \
-     if(_tmp && _tmp->swapped) { \
+     if(_tmp->swapped) { \
        low_mt_lock_interpreter(); \
        THREADS_FPRINTF(1, (stderr, "THREADS_DISALLOW() %s:%d t:%08x(#%d)\n", \
 			   __FILE__, __LINE__, \
@@ -706,7 +706,7 @@ PMOD_EXPORT extern int Pike_in_gc;
 
 #define THREADS_DISALLOW_UID() \
      REVEAL_GLOBAL_VARIABLES(); \
-     if(_tmp_uid && _tmp_uid->swapped) { \
+     if(_tmp_uid->swapped) { \
        low_mt_lock_interpreter(); \
        live_threads--; \
        THREADS_FPRINTF(1, (stderr, \