diff --git a/cde/lib/csa/xtclient.c b/cde/lib/csa/xtclient.c
index aff5b03ae..9e58bc0fd 100644
--- a/cde/lib/csa/xtclient.c
+++ b/cde/lib/csa/xtclient.c
@@ -59,8 +59,7 @@ extern void
 _DtCm_register_xtcallback(XtAppContext appct)
 {
 	XtInputId	id;
-	int	i, j;
-	fd_mask	fmask, *bits;
+	int	i;
 	fd_set	fdset = svc_fdset;
 
 	DP(("xtclient.c: _DtCm_register_xtcallback()\n"));
@@ -69,29 +68,21 @@ _DtCm_register_xtcallback(XtAppContext appct)
 		return;
 
 	/* assuming only 1 bit is set */
-	bits = fdset.fds_bits;
 
-	for (i = 0; i < FD_SETSIZE; i += NFDBITS) {
-		fmask = *bits;
-		for (j = 0; fmask != 0; j++, fmask >>= 1) {
-			if (fmask & 0x1) {
+	for (i = 0; i < FD_SETSIZE; i++) {
+          if (FD_ISSET(i, &svc_fdset))
+            {
+              /* register callback with XtAppAddInput
+               * for rpc input
+               */
+              id = XtAppAddInput(appct, i,
+                                 (XtPointer)XtInputReadMask,
+                                 xtcallback, NULL);
 
-				if ((i + j) >= FD_SETSIZE)
-					break;
-
-        			/* register callback with XtAppAddInput
-				 * for rpc input
-				 */
-				id = XtAppAddInput(appct, ((i *NFDBITS) + j),
-					(XtPointer)XtInputReadMask,
-					xtcallback, NULL);
-
-				DP(("xtclient.c: id %d for input at fd %d\n",
-					id, ((i * NFDBITS) + j)));
-			}
-		}
-		bits++;
-	}
+              DP(("xtclient.c: id %d for input at fd %d\n",
+                  id, ((i * NFDBITS) + j)));
+            }
+        }
 }
 
 /*****************************************************************************
diff --git a/cde/programs/dtspcd/spcd_event.c b/cde/programs/dtspcd/spcd_event.c
index 01fdf28b1..a79d19f23 100644
--- a/cde/programs/dtspcd/spcd_event.c
+++ b/cde/programs/dtspcd/spcd_event.c
@@ -84,11 +84,11 @@ void SPCD_MainLoopUntil(Boolean *flag)
   fd_set input_mask, except_mask;
   int n, fd;
   int result;
+
   do {
-    for (n=0; n<fd_vec_size; n++) {
-      input_mask.fds_bits[n] = Sb_Input_Mask.fds_bits[n];
-      except_mask.fds_bits[n] = Sb_Except_Mask.fds_bits[n];
-    }
+    memcpy(&input_mask, &Sb_Input_Mask, sizeof(fd_set));
+    memcpy(&except_mask, &Sb_Except_Mask, sizeof(fd_set));
+
     
     do result=select(SPCD_max_fd + 1, FD_SET_CAST(&input_mask),
 		     FD_SET_CAST(NULL),