diff --git a/garouter/gaStem.c b/garouter/gaStem.c
index 9abbbd01..aa191c0e 100644
--- a/garouter/gaStem.c
+++ b/garouter/gaStem.c
@@ -222,7 +222,7 @@ gaStemAssign(routeUse, doWarn, loc, term, net, netList)
      * See if this location lies inside a river-routing channel.
      * If it does, return the channel containing it.
      */
-    if (ch = gaStemContainingChannel(routeUse, doWarn, loc))
+    if ((ch = gaStemContainingChannel(routeUse, doWarn, loc)))
     {
 	if (ch->gcr_type != CHAN_HRIVER && ch->gcr_type != CHAN_VRIVER)
 	    goto fail;
@@ -347,7 +347,7 @@ gaStemContainingChannelFunc(tile, pCh)
 {
     GCRChannel *ch;
 
-    if (ch = (GCRChannel *) tile->ti_client)
+    if ((ch = (GCRChannel *) tile->ti_client))
     {
 	if (*pCh)
 	{
diff --git a/gcr/gcrInit.c b/gcr/gcrInit.c
index 32618449..9f47e868 100644
--- a/gcr/gcrInit.c
+++ b/gcr/gcrInit.c
@@ -236,7 +236,7 @@ gcrUnlinkPin(pin)
 {
     GCRNet *net;
 
-    if (net = pin->gcr_pId)
+    if ((net = pin->gcr_pId))
     {
 	ASSERT(pin == net->gcr_lPin, "gcrUnlinkPin");
 	net->gcr_lPin = pin->gcr_pNext;
diff --git a/grouter/grouteMain.c b/grouter/grouteMain.c
index e1dfd23d..1a673a5a 100644
--- a/grouter/grouteMain.c
+++ b/grouter/grouteMain.c
@@ -360,7 +360,7 @@ glProcessLoc(startList, loc, bestCost, doFast)
     }
     else glMazeShortest = FALSE;
     bestPt = (GlPoint *) NULL;
-    while (lastPt = glMazeFindPath(loc, bestCost))
+    while ((lastPt = glMazeFindPath(loc, bestCost)))
     {
 	adjustedPt = glCrossAdjust((GlPoint *) NULL, lastPt);
 	if (adjustedPt->gl_cost < bestCost)
diff --git a/grouter/grouteMaze.c b/grouter/grouteMaze.c
index 2615adc7..50d73467 100644
--- a/grouter/grouteMaze.c
+++ b/grouter/grouteMaze.c
@@ -570,7 +570,7 @@ glMazeResetCost(headPage, headFree)
     for (gpage = headPage; gpage; gpage = gpage->glp_next)
     {
 	for (n = headFree; n < gpage->glp_free; n++)
-	    if (pin = gpage->glp_array[n].gl_pin)
+	    if ((pin = gpage->glp_array[n].gl_pin))
 	    {
 		pin->gcr_cost = INFINITY;
 		if (pin->gcr_linked)
diff --git a/grouter/groutePath.c b/grouter/groutePath.c
index 13e62d9e..f4dd32a9 100644
--- a/grouter/groutePath.c
+++ b/grouter/groutePath.c
@@ -124,7 +124,7 @@ glListToHeap(list, destPt)
 	 * to lie along that channel portion).
 	 */
 	pin = temp->gl_pin;
-	if (tp = glChanPinToTile((Tile *) NULL, pin))
+	if ((tp = glChanPinToTile((Tile *) NULL, pin)))
 	{
 	    new = glPathNew(pin, temp->gl_cost, (GlPoint *) NULL);
 	    new->gl_tile = tp;
diff --git a/irouter/irCommand.c b/irouter/irCommand.c
index 83ca2244..b91afa70 100644
--- a/irouter/irCommand.c
+++ b/irouter/irCommand.c
@@ -898,7 +898,7 @@ irContactsCmd(w, cmd)
 	    return;
 	}
 
-	if(rC=irFindRouteContact(tileType))
+	if((rC=irFindRouteContact(tileType)))
 	{
 	    /* Print Contact Heading */
 	    TxPrintf("%-12.12s ", "contact");
@@ -996,7 +996,7 @@ irContactsCmd(w, cmd)
 	    return;
 	}
 
-	if(rC=irFindRouteContact(tileType))
+	if((rC=irFindRouteContact(tileType)))
 	{
 	    /* Lookup contact parameter name in table */
 	    which = LookupStruct(
@@ -1272,7 +1272,7 @@ irLayersCmd(w, cmd)
 	    return;
 	}
 
-	if (rL=irFindRouteLayer(tileType))
+	if ((rL=irFindRouteLayer(tileType)))
 	{
 	    /* Print Route Layer Heading */
 	    TxPrintf("%-12.12s ", "layer");
@@ -1372,7 +1372,7 @@ irLayersCmd(w, cmd)
 	    return;
 	}
 
-	if (rL=irFindRouteLayer(tileType))
+	if ((rL=irFindRouteLayer(tileType)))
 	{
 	    /* Lookup route layer parameter name in table */
 	    which = LookupStruct(
@@ -1928,7 +1928,7 @@ irSpacingsCmd(w, cmd)
 		return;
 	    }
 
-	    if (rT=irFindRouteType(tileType))
+	    if ((rT=irFindRouteType(tileType)))
 	    {
 
 		TxPrintf("%s:  ",
diff --git a/net2ir/net2ir.c b/net2ir/net2ir.c
index 4410be6c..42500ea7 100644
--- a/net2ir/net2ir.c
+++ b/net2ir/net2ir.c
@@ -120,7 +120,7 @@ getfirst:
 	    continue;
 	}
 
-	if (cp = strchr(line1, '\n'))
+	if ((cp = strchr(line1, '\n')))
 	    *cp = '\0';
 
 	if (nterms >= 2)
diff --git a/router/rtrDcmpose.c b/router/rtrDcmpose.c
index b0f4e283..1161a672 100644
--- a/router/rtrDcmpose.c
+++ b/router/rtrDcmpose.c
@@ -432,7 +432,7 @@ rtrHashKill(ht)
     HashSearch hs;
 
     HashStartSearch(&hs);
-    while (he = HashNext(ht, &hs))
+    while ((he = HashNext(ht, &hs)))
 	GCRFreeChannel((GCRChannel *) HashGetValue(he));
     HashKill(ht);
 }
diff --git a/router/rtrPin.c b/router/rtrPin.c
index 9f71d0dd..3fa77eb8 100644
--- a/router/rtrPin.c
+++ b/router/rtrPin.c
@@ -171,7 +171,7 @@ rtrPinArrayInit(ch, side, pins, nPins)
 	    if (side == GEO_WEST) p.p_x--;
 	    if (side == GEO_SOUTH) p.p_y--;
 	    tp = TiSrPointNoHint(RtrChannelPlane, &p);
-	    if (adjacent = (GCRChannel *) tp->ti_client)
+	    if ((adjacent = (GCRChannel *) tp->ti_client))
 	    {
 		/* Only link if entering the linked channel from a legal side */
 		linked = RtrPointToPin(adjacent, otherSide, &point);
diff --git a/router/rtrStem.c b/router/rtrStem.c
index 120b6827..90d6fe35 100644
--- a/router/rtrStem.c
+++ b/router/rtrStem.c
@@ -370,7 +370,7 @@ RtrStemAssignExt(use, doWarn, loc, term, net)
 	    rtrStemRange(loc, dr->dr_dir, &si);
 	    if (si.stem_dir != -1)
 	    {
-		if (pin = rtrStemTip(loc, &si, use))
+		if ((pin = rtrStemTip(loc, &si, use)))
 		{
 		    /* Mark the pin as taken */
 		    pins++;
@@ -476,7 +476,7 @@ rtrStemTip(loc, si, use)
      * Try each crossing point in the best direction, starting from the
      * stem_start point and working outward toward stem_lo and stem_hi.
      */
-    if (pin = rtrStemTryPin(loc, si->stem_dir, &si->stem_start, use))
+    if ((pin = rtrStemTryPin(loc, si->stem_dir, &si->stem_start, use)))
 	return (pin);
 
     plo = phi = si->stem_start;
@@ -949,7 +949,7 @@ rtrStemSearch(center, dir, point)
 	tile = TiSrPointNoHint(RtrChannelPlane, point);
 	if (TiGetType(tile) == TT_SPACE)
 	{
-	    if (ch = (GCRChannel *) tile->ti_client)
+	    if ((ch = (GCRChannel *) tile->ti_client))
 		break;
 	    return ((GCRChannel *) NULL);
 	}