Index: ram/cminit.c
===================================================================
--- ram/cminit.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/cminit.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -122,5 +122,5 @@
 	QQop = QQstr;
 
-	while (*QQop++ = *q++) ;
+	while ((*QQop++ = *q++)) ;
 
 	QQip = t;
@@ -163,5 +163,5 @@
 	QQop = QQstr;
 
-	while (*QQop++ = *q++) ;
+	while ((*QQop++ = *q++)) ;
 
 	QQip = t;
@@ -195,5 +195,5 @@
 	n = c - '0';
 
-	while (c = *p) {
+	while ((c = *p)) {
 
 		if (!isascii(c))
@@ -252,5 +252,5 @@
 	n = 0;
 
-	while (p = *l++) {
+	while ((p = *l++)) {
 
 		q = p;
@@ -260,5 +260,5 @@
 			QQop = QQstr;
 
-			while (*QQop++ = *q++) ;
+			while ((*QQop++ = *q++)) ;
 
 			QQlnum = n;
@@ -288,5 +288,5 @@
 	n = 0;
 
-	while (p = *l++) {
+	while ((p = *l++)) {
 
 		q = p;
@@ -296,5 +296,5 @@
 			QQop = QQstr;
 
-			while (*QQop++ = *q++) ;
+			while ((*QQop++ = *q++)) ;
 
 			QQlnum = n;
Index: ram/dformat.c
===================================================================
--- ram/dformat.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/dformat.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -55,6 +55,6 @@
 	for (trk = 0; trk < 80; trk++) {
 
-		if (dferror = (int16_t)XBIOS(X_FORMAT, dfbuf, 0L, 0, 9,
-		    trk, 0, 1, 0x87654321L, 0xE5E5)) {
+		if ((dferror = (int16_t)XBIOS(X_FORMAT, dfbuf, 0L, 0, 9,
+		    trk, 0, 1, 0x87654321L, 0xE5E5))) {
 
 			defect = 1;	/* unable to format 1st side */
@@ -64,6 +64,6 @@
 		if (dfsides EQ 2) {	/* format second side */
 
-			if (dferror = (int16_t)XBIOS(X_FORMAT, dfbuf, 0L, 0, 9,
-			    trk, 1, 1, 0x87654321L, 0xE5E5)) {
+			if ((dferror = (int16_t)XBIOS(X_FORMAT, dfbuf, 0L, 0, 9,
+			    trk, 1, 1, 0x87654321L, 0xE5E5))) {
 
 				defect = 2;	/* unable to format 2nd side */
@@ -80,5 +80,5 @@
 	/* write boot sector to disk */
 
-	if (dferror = (int16_t)XBIOS(X_FLOPWR, dfbuf, 0L, 0, 1, 0, 0, 1)) {
+	if ((dferror = (int16_t)XBIOS(X_FLOPWR, dfbuf, 0L, 0, 1, 0, 0, 1))) {
 
 		defect = 3;	/* unable to write boot sector */
@@ -101,6 +101,6 @@
 	}
 
-	if (dferror = (int16_t)BIOS(B_RDWR, 3, dfbuf,
-	    DF_FSIZ, DF_FREC, 0)) {
+	if ((dferror = (int16_t)BIOS(B_RDWR, 3, dfbuf,
+	    DF_FSIZ, DF_FREC, 0))) {
 
 		defect = 4;	/* unable to write primary FAT */
@@ -108,6 +108,6 @@
 	}
 
-	if (dferror = (int16_t)BIOS(B_RDWR, 3, dfbuf,
-	    DF_FSIZ, DF_FREC-DF_FSIZ, 0)) {
+	if ((dferror = (int16_t)BIOS(B_RDWR, 3, dfbuf,
+	    DF_FSIZ, DF_FREC-DF_FSIZ, 0))) {
 
 		defect = 5;	/* unable to write secondary FAT */
@@ -119,6 +119,6 @@
 	memsetw(dfbuf, 0, 4096);
 
-	if (dferror = (int16_t)BIOS(B_RDWR, 3, dfbuf,
-	    DF_DSIZ, DF_FREC+DF_FSIZ, 0)) {
+	if ((dferror = (int16_t)BIOS(B_RDWR, 3, dfbuf,
+	    DF_DSIZ, DF_FREC+DF_FSIZ, 0))) {
 
 		defect = 6;	/* unable to write directory */
Index: ram/enterit.c
===================================================================
--- ram/enterit.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/enterit.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -303,9 +303,10 @@
 		/* limit text movement to 1 axis */
 
-		if (cmtype NE CT_GRAF)
+		if (cmtype NE CT_GRAF) {
 			if (acx GE acy)
 				cyrate = 0;
 			else
 				cxrate = 0;
+		}
 	}
 }
Index: ram/etiosc.c
===================================================================
--- ram/etiosc.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/etiosc.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -102,12 +102,14 @@
 int16_t cnvp2c(void)
 {
-	if (ebuf[0] EQ 9)		/* high limit is C9 00 */
+	if (ebuf[0] EQ 9) {		/* high limit is C9 00 */
 		if (ebuf[1] GT 2)
 			return(FAILURE);
-		else if (ebuf[1] EQ 2)
+		else if (ebuf[1] EQ 2) {
 			if (ebuf[2] NE 7)
 				return(FAILURE);
 			else if (ebuf[3] OR ebuf[4])
 				return(FAILURE);
+		}
+	}
 
 	cents = (ebuf[0] * 1200) + pitches[ebuf[1]] + shrpflt[ebuf[2] - 7]
Index: ram/instdsp.c
===================================================================
--- ram/instdsp.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/instdsp.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -218,9 +218,10 @@
 	}
 
-	if (how AND (xp EQ 0))
+	if (how AND (xp EQ 0)) {
 		if (wn EQ 12)
 			drawpt(ptx, pty, ID_SELD);
 		else
 			idpoint(ptx, pty, ID_SELD);
+	}
 
 	for (i = 1; i < np; i++) {
Index: ram/libdsp.c
===================================================================
--- ram/libdsp.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/libdsp.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -1202,5 +1202,5 @@
 	/* make sure the name is unique */
 
-	if (rc = ckdups()) {
+	if ((rc = ckdups())) {
 
 		sprintf(ldmsg1, "Duplicate %s", ftypes[rc - 1][2]);
Index: ram/msl.c
===================================================================
--- ram/msl.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/msl.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -380,9 +380,10 @@
 				case 73:		/* Tempo */
 
-					if (aval > 50)		/* dead band */
+					if (aval > 50) {	/* dead band */
 						if (aval < 53)
 							aval = 50;
 						else
 							aval -= 2;
+					}
 
 					tmpomlt = aval > 100 ? 100 : aval;
@@ -417,9 +418,10 @@
 				case 74:		/* Time */
 
-					if (aval > 50)		/* dead band */
+					if (aval > 50) {	/* dead band */
 						if (aval < 53)
 							aval = 50;
 						else
 							aval -= 2;
+					}
 
 					ti = aval > 100 ? 100 : aval;
@@ -447,9 +449,10 @@
 				case 75:		/* Tuning */
 
-					if (aval > 50)		/* dead band */
+					if (aval > 50) {	/* dead band */
 						if (aval < 53)
 							aval = 50;
 						else
 							aval -= 2;
+					}
 
 					i = (aval > 100) ? 100 : aval;
Index: ram/ptdkey.c
===================================================================
--- ram/ptdkey.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/ptdkey.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -1185,5 +1185,5 @@
 
 			if (((ptesuba & 0x0001) AND (stccol EQ 45)) OR
-			    ((0 EQ ptesuba & 0x0001) AND (stccol EQ 44)))
+			    ((0 EQ (ptesuba & 0x0001)) AND (stccol EQ 44)))
 				ctcon();
 			else
Index: ram/ptfield.c
===================================================================
--- ram/ptfield.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/ptfield.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -268,7 +268,7 @@
 				patches[sp].prevstm = pp;
 
-			if (sp = findnxt(cp))		/* adjust ptecpos */
+			if ((sp = findnxt(cp)))		/* adjust ptecpos */
 				ptecpos = sp;
-			else if (pp = findprv(cp))
+			else if ((pp = findprv(cp)))
 				ptecpos = pp;
 			else
@@ -279,5 +279,5 @@
 			for (i = 0; i < NDEFSTMS; ++i) {	/* adjust defptr list */
 
-				if (cp = defptr[i]) {		/* in use ? */
+				if ((cp = defptr[i])) {		/* in use ? */
 
 					pp = 0;		/* initial predecessor */
Index: ram/ptselbx.c
===================================================================
--- ram/ptselbx.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/ptselbx.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -1242,5 +1242,5 @@
 				ptedat2 = 0x0000;
 
-				if (ptd = desdatf[i]) {
+				if ((ptd = desdatf[i])) {
 
 					if (ptd & 1)
Index: ram/ptwrite.c
===================================================================
--- ram/ptwrite.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/ptwrite.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -59,5 +59,5 @@
 	nb = 0L;
 
-	if (pp = find1st()) {
+	if ((pp = find1st())) {
 
 		while (pp) {
@@ -100,5 +100,5 @@
 		LCFBX10, LCBBX10);
 
-	if (pp = find1st()) {
+	if ((pp = find1st())) {
 
 		while (pp) {
Index: ram/scadv.c
===================================================================
--- ram/scadv.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/scadv.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -251,5 +251,5 @@
 		for (i = 224; i--; ) {
 
-			if (sword = maskpx & *fsl)
+			if ((sword = maskpx & *fsl))
 				*optr = (*optr & masksl) | sword;
 
Index: ram/stmproc.c
===================================================================
--- ram/stmproc.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/stmproc.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -687,5 +687,5 @@
 			/* find the end of the chain for the stimulus */
 
-			while (pp = patches[np].nextstm)
+			while ((pp = patches[np].nextstm))
 				np = pp;
 
Index: ram/uslice.c
===================================================================
--- ram/uslice.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/uslice.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -230,60 +230,60 @@
 				/* update the slice */
 
-				if (w = *pxptr++)  /* 212 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 213 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 214 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 215 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 216 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 217 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 218 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 219 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 220 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 221 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 222 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr)    /* 223 */
+				if ((w = *pxptr++))  /* 212 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 213 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 214 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 215 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 216 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 217 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 218 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 219 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 220 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 221 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 222 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr))    /* 223 */
 					*slptr = (*slptr & mask2) | (w & ncolor);
 
@@ -514,60 +514,60 @@
 				/* update the slice */
 
-				if (w = *pxptr++)  /* 212 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 213 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 214 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 215 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 216 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 217 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 218 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 219 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 220 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 221 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr++)  /* 222 */
-					*slptr = (*slptr & mask2) | (w & ncolor);
-
-				++slptr;
-
-				if (w = *pxptr)    /* 223 */
+				if ((w = *pxptr++))  /* 212 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 213 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 214 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 215 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 216 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 217 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 218 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 219 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 220 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 221 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr++))  /* 222 */
+					*slptr = (*slptr & mask2) | (w & ncolor);
+
+				++slptr;
+
+				if ((w = *pxptr))    /* 223 */
 					*slptr = (*slptr & mask2) | (w & ncolor);
 
Index: ram/wheel.c
===================================================================
--- ram/wheel.c	(revision 72741f40bd3be649adcb12facf48298bf8e49980)
+++ ram/wheel.c	(revision 00c31a23ff32ccc5eb1a681213f7a7dd05501f58)
@@ -176,5 +176,5 @@
 #endif
 
-	while (c = 0x00FF & *str++)		/* get a byte */
+	while ((c = 0x00FF & *str++))		/* get a byte */
 		BIOS(B_PUTC, PRT_DEV, c);	/* output it */
 }