snapshot of project "lynx", label v2-8-3dev_10

37 files changed, 787 insertions, 786 deletions

diff --git a/src/AttrList.h b/src/AttrList.h
index 66d434cf..28f43ee6 100644
--- a/src/AttrList.h
+++ b/src/AttrList.h
@@ -47,7 +47,7 @@ typedef struct {
  int cattr; /* attributes to go with the color */
 } HTCharStyle;
 
-#define HText_characterStyle CTRACE(tfp,"HTC called from %s/%d\n",__FILE__,__LINE__);_internal_HTC
+#define HText_characterStyle CTRACE((tfp,"HTC called from %s/%d\n",__FILE__,__LINE__));_internal_HTC
 
 #undef HText_characterStyle
 #define HText_characterStyle _internal_HTC
diff --git a/src/GridText.c b/src/GridText.c
index 76f57635..2a967f8b 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -65,7 +65,7 @@ void LynxClearScreenCache NOARGS
 {
     int i,j;
 
-    CTRACE(tfp, "GridText: flushing cached screen styles\n");
+    CTRACE((tfp, "GridText: flushing cached screen styles\n"));
     for (i=0;i<CACHEH;i++)
 	for (j=0;j<CACHEW;j++)
 	    cached_styles[i][j]=s_a;
@@ -445,14 +445,14 @@ PRIVATE void * LY_check_calloc ARGS2(
 	if (t == HTMainText)
 	    t = NULL;		/* shouldn't happen */
 	{
-	CTRACE(tfp, "\r *** Emergency freeing document %d/%d for '%s'%s!\n",
+	CTRACE((tfp, "\r *** Emergency freeing document %d/%d for '%s'%s!\n",
 		    i + 1, n,
 		    ((t && t->node_anchor &&
 		      t->node_anchor->address) ?
 		     t->node_anchor->address : "unknown anchor"),
 		    ((t && t->node_anchor &&
 		      t->node_anchor->post_data) ?
-		     " with POST data" : ""));
+		     " with POST data" : "")));
 	}
 	HTList_removeObjectAt(loaded_texts, i);
 	HText_free(t);
@@ -537,11 +537,11 @@ PUBLIC HText *	HText_new ARGS1(
     if (!self)
 	return self;
 
-    CTRACE(tfp, "GridText: start HText_new\n");
+    CTRACE((tfp, "GridText: start HText_new\n"));
 
 #if defined(VMS) && defined (VAXC) && !defined(__DECC)
     status = lib$stat_vm(&VMType, &VMTotal);
-    CTRACE(tfp, "GridText: VMTotal = %d\n", VMTotal);
+    CTRACE((tfp, "GridText: VMTotal = %d\n", VMTotal));
 #endif /* VMS && VAXC && !__DECC */
 
     if (!loaded_texts)	{
@@ -560,7 +560,7 @@ PUBLIC HText *	HText_new ARGS1(
      */
     if (anchor->document) {
 	HTList_removeObject(loaded_texts, anchor->document);
-	CTRACE(tfp, "GridText: Auto-uncaching\n") ;
+	CTRACE((tfp, "GridText: Auto-uncaching\n")) ;
 	((HText *)anchor->document)->node_anchor = NULL;
 	HText_free((HText *)anchor->document);
 	anchor->document = NULL;
@@ -574,11 +574,11 @@ PUBLIC HText *	HText_new ARGS1(
     if (HTList_count(loaded_texts) > HTCacheSize)
 #endif /* VMS && VAXC && !__DECC */
     {
-	CTRACE(tfp, "GridText: Freeing off cached doc.\n");
+	CTRACE((tfp, "GridText: Freeing off cached doc.\n"));
 	HText_free((HText *)HTList_removeFirstObject(loaded_texts));
 #if defined(VMS) && defined (VAXC) && !defined(__DECC)
 	status = lib$stat_vm(&VMType, &VMTotal);
-	CTRACE(tfp, "GridText: VMTotal reduced to %d\n", VMTotal);
+	CTRACE((tfp, "GridText: VMTotal reduced to %d\n", VMTotal));
 #endif /* VMS && VAXC && !__DECC */
     }
 
@@ -1811,9 +1811,9 @@ PRIVATE void display_page ARGS3(
 				(HTAnchor *)Anchor_ptr->anchor, LINK_INTERNAL);
 			    if (link_dest_intl && link_dest_intl != link_dest) {
 
-				CTRACE(tfp,
+				CTRACE((tfp,
 		    "GridText: display_page: unexpected typed link to %s!\n",
-					    link_dest_intl->parent->address);
+					    link_dest_intl->parent->address));
 				link_dest_intl = NULL;
 			    }
 			} else
@@ -1903,9 +1903,9 @@ PRIVATE void display_page ARGS3(
 		 *  Not showing anchor.
 		 */
 		if (Anchor_ptr->hightext && *Anchor_ptr->hightext)
-		    CTRACE(tfp,
+		    CTRACE((tfp,
 			    "\nGridText: Not showing link, hightext=%s\n",
-			    Anchor_ptr->hightext);
+			    Anchor_ptr->hightext));
 	    }
 	}
 
@@ -1923,7 +1923,7 @@ PRIVATE void display_page ARGS3(
 	    if (LYCursesON) {
 		HTAlert(MAXLINKS_REACHED);
 	    }
-	    CTRACE(tfp, "\ndisplay_page: MAXLINKS reached.\n");
+	    CTRACE((tfp, "\ndisplay_page: MAXLINKS reached.\n"));
 	    break;
 	}
     } /* end of loop "Add the anchors to Lynx structures." */
@@ -2047,20 +2047,20 @@ PRIVATE void split_line ARGS2(
     text->LastChar = ' ';
 
 #ifdef DEBUG_APPCH
-    CTRACE(tfp,"GridText: split_line(%p,%d) called\n", text, split);
-    CTRACE(tfp,"   bold_on=%d, underline_on=%d\n", bold_on, underline_on);
+    CTRACE((tfp,"GridText: split_line(%p,%d) called\n", text, split));
+    CTRACE((tfp,"   bold_on=%d, underline_on=%d\n", bold_on, underline_on));
 #endif
 
     if (split > previous->size) {
-	CTRACE(tfp,
+	CTRACE((tfp,
 	       "*** split_line: split==%d greater than last_line->size==%d !\n",
-	       split, previous->size);
+	       split, previous->size));
 	if (split > MAX_LINE) {
 	    split = previous->size;
 	    if ((cp = strrchr(previous->data, ' ')) &&
 		cp - previous->data > 1)
 		split = cp - previous->data;
-	    CTRACE(tfp, "                split adjusted to %d.\n", split);
+	    CTRACE((tfp, "                split adjusted to %d.\n", split));
 	}
     }
 
@@ -2280,7 +2280,7 @@ PRIVATE void split_line ARGS2(
 #ifdef DEBUG_APPCH
     if (s != (int)split)
 #endif
-	CTRACE(tfp,"GridText: split_line(%d [now:%d]) called\n", split, s);
+	CTRACE((tfp,"GridText: split_line(%d [now:%d]) called\n", split, s));
 #endif
 
 #if defined(USE_COLOR_STYLE)
@@ -2414,9 +2414,9 @@ PRIVATE void split_line ARGS2(
     }
     if (previous->numstyles > 0 && previous->styles[LastStyle].direction) {
 
-	CTRACE(tfp, "%s\n%s%s\n",
+	CTRACE((tfp, "%s\n%s%s\n",
 		    "........... Too many character styles on line:",
-		    "........... ", previous->data);
+		    "........... ", previous->data));
     }
     if (line->numstyles > 0 && line->numstyles < MAX_STYLES_ON_LINE) {
 	int n;
@@ -2525,8 +2525,8 @@ PRIVATE void split_line ARGS2(
 		    (!a->number || a->show_anchor) &&
 		    a0 <= s + HeadTrim) {
 #ifdef DEBUG_SPLITLINE
-		CTRACE(tfp, "anchor %d case %d: ",
-		       a->number,1);
+		CTRACE((tfp, "anchor %d case %d: ",
+		       a->number,1));
 #endif
 		    /*
 		     *  It is meant to be empty, and/or endAnchor
@@ -2544,8 +2544,8 @@ PRIVATE void split_line ARGS2(
 		     a0 >= s - TailTrim && a0 <= s + HeadTrim &&
 		     a1 <= s + HeadTrim) {
 #ifdef DEBUG_SPLITLINE
-		CTRACE(tfp, "anchor %d case %d: ",
-		       a->number,2);
+		CTRACE((tfp, "anchor %d case %d: ",
+		       a->number,2));
 #endif
 		    /*
 		     *  endAnchor has seen it, it is effectively empty
@@ -2566,8 +2566,8 @@ PRIVATE void split_line ARGS2(
 		    new_ext = 0;
 		} else if (a0 >= s + HeadTrim) {
 #ifdef DEBUG_SPLITLINE
-		CTRACE(tfp, "anchor %d case %d: ",
-		       a->number,3);
+		CTRACE((tfp, "anchor %d case %d: ",
+		       a->number,3));
 #endif
 		    /*
 		     *  Completely after split, just shift.
@@ -2575,8 +2575,8 @@ PRIVATE void split_line ARGS2(
 		    new_pos = a0 - TailTrim + 1 - HeadTrim + SpecialAttrChars;
 		} else if (!old_e) {
 #ifdef DEBUG_SPLITLINE
-		CTRACE(tfp, "anchor %d case %d: ",
-		       a->number,4);
+		CTRACE((tfp, "anchor %d case %d: ",
+		       a->number,4));
 #endif
 		    /*
 		     *  No extent set, we may still be growing it.
@@ -2596,39 +2596,39 @@ PRIVATE void split_line ARGS2(
 		} else if (a0 < s - TailTrim &&
 			   a1 > s + HeadTrim) {
 #ifdef DEBUG_SPLITLINE
-		CTRACE(tfp, "anchor %d case %d: ",
-		       a->number,5);
+		CTRACE((tfp, "anchor %d case %d: ",
+		       a->number,5));
 #endif
 		    new_pos = a0;
 		    new_ext = old_e - TailTrim - HeadTrim + SpecialAttrChars;
 		} else if (a0 < s - TailTrim) {
 #ifdef DEBUG_SPLITLINE
-		CTRACE(tfp, "anchor %d case %d: ",
-		       a->number,6);
+		CTRACE((tfp, "anchor %d case %d: ",
+		       a->number,6));
 #endif
 		    new_pos = a0;
 		    new_ext = s - TailTrim - a0;
 		} else if (a1 > s + HeadTrim) {
 #ifdef DEBUG_SPLITLINE
-		CTRACE(tfp, "anchor %d case %d: ",
-		       a->number,7);
+		CTRACE((tfp, "anchor %d case %d: ",
+		       a->number,7));
 #endif
 		    new_pos = s - TailTrim + 1 + SpecialAttrChars;
 		    new_ext = old_e - (s + HeadTrim - a0);
 		} else {
-		    CTRACE(tfp, "split_line anchor %d line %d: This should not happen!\n",
-			   a->number, a->line_num);
-		    CTRACE(tfp,
+		    CTRACE((tfp, "split_line anchor %d line %d: This should not happen!\n",
+			   a->number, a->line_num));
+		    CTRACE((tfp,
 			   "anchor %d: (T,H,S)=(%d,%d,%d); (line,start,pos,ext):(%d,%d,%d,%d)!\n",
 			   a->number,
 			   TailTrim,HeadTrim,SpecialAttrChars,
-			   a->line_num,a->start,a->line_pos,a->extent);
+			   a->line_num,a->start,a->line_pos,a->extent));
 		    continue;
 		}
 #ifdef DEBUG_SPLITLINE
-		CTRACE(tfp, "(T,H,S)=(%d,%d,%d); (line,start,pos,ext):(%d,%d,%d,%d",
+		CTRACE((tfp, "(T,H,S)=(%d,%d,%d); (line,start,pos,ext):(%d,%d,%d,%d",
 		       TailTrim,HeadTrim,SpecialAttrChars,
-		       a->line_num,a->start,a->line_pos,a->extent);
+		       a->line_num,a->start,a->line_pos,a->extent));
 #endif
 		if (new_pos != a->line_pos)
 		    a->start = new_pos + d;
@@ -2640,8 +2640,8 @@ PRIVATE void split_line ARGS2(
 		a->extent = new_ext;
 
 #ifdef DEBUG_SPLITLINE
-		CTRACE(tfp, ")->(%d,%d,%d,%d)\n",
-		       a->line_num,a->start,a->line_pos,a->extent);
+		CTRACE((tfp, "))->(%d,%d,%d,%d)\n",
+		       a->line_num,a->start,a->line_pos,a->extent));
 #endif
 
 	    }
@@ -2907,7 +2907,7 @@ PRIVATE void split_line ARGS2(
 	     * spaces in previous line
 	     */
 	    if (line->size) {
-		  CTRACE(tfp,"justification: shouldn't happen - new line is not empty!\n");
+		  CTRACE((tfp,"justification: shouldn't happen - new line is not empty!\n"));
 	    }
 
 	    for (p=previous->data;*p;++p)
@@ -2998,7 +2998,7 @@ PUBLIC void HText_setStyle ARGS2(
     after = text->style->spaceAfter;
     before = style->spaceBefore;
 
-    CTRACE(tfp, "GridText: Change to style %s\n", style->name);
+    CTRACE((tfp, "GridText: Change to style %s\n", style->name));
 
     blank_lines (text, ((after > before) ? after : before));
 
@@ -3054,29 +3054,29 @@ PUBLIC void HText_appendCharacter ARGS2(
 	}
 
 	if (special != NULL) {
-	    CTRACE(tfp, "add(%s %d special char) %d/%d\n", special, ch,
-		   HTisDocumentSource(), HTOutputFormat != WWW_SOURCE);
+	    CTRACE((tfp, "add(%s %d special char) %d/%d\n", special, ch,
+		   HTisDocumentSource(), HTOutputFormat != WWW_SOURCE));
 	} else {
 #ifdef CJK_EX	/* 1998/08/30 (Sun) 13:26:23 */
 	    if (save_ch == 0) {
 		if (IS_SJIS_HI1(ch) || IS_SJIS_HI2(ch)) {
 		    save_ch = ch;
 		} else {
-		    CTRACE(tfp, "add(%c) %d/%d\n", ch,
-			HTisDocumentSource(), HTOutputFormat != WWW_SOURCE);
+		    CTRACE((tfp, "add(%c) %d/%d\n", ch,
+			HTisDocumentSource(), HTOutputFormat != WWW_SOURCE));
 		}
 	    } else {
-		CTRACE(tfp, "add(%c%c) %d/%d\n", save_ch, ch,
-			HTisDocumentSource(), HTOutputFormat != WWW_SOURCE);
+		CTRACE((tfp, "add(%c%c) %d/%d\n", save_ch, ch,
+			HTisDocumentSource(), HTOutputFormat != WWW_SOURCE));
 		save_ch = 0;
 	    }
 #else
 	    if (ch < 0x80) {
-		CTRACE(tfp, "add(%c) %d/%d\n", ch,
-		    HTisDocumentSource(), HTOutputFormat != WWW_SOURCE);
+		CTRACE((tfp, "add(%c) %d/%d\n", ch,
+		    HTisDocumentSource(), HTOutputFormat != WWW_SOURCE));
 	    } else {
-		CTRACE(tfp, "add(%02x) %d/%d\n", ch,
-		    HTisDocumentSource(), HTOutputFormat != WWW_SOURCE);
+		CTRACE((tfp, "add(%02x) %d/%d\n", ch,
+		    HTisDocumentSource(), HTOutputFormat != WWW_SOURCE));
 	    }
 #endif	/* CJK_EX */
 	}
@@ -3901,15 +3901,15 @@ PUBLIC void HText_endAnchor ARGS2(
 	}
     }
 
-    CTRACE(tfp, "GridText:HText_endAnchor: number:%d link_type:%d\n",
-			a->number, a->link_type);
+    CTRACE((tfp, "GridText:HText_endAnchor: number:%d link_type:%d\n",
+			a->number, a->link_type));
     if (a->link_type == INPUT_ANCHOR) {
 	/*
 	 *  Shouldn't happen, but put test here anyway to be safe. - LE
 	 */
 
-	CTRACE(tfp,
-	   "HText_endAnchor: internal error: last anchor was input field!\n");
+	CTRACE((tfp,
+	   "HText_endAnchor: internal error: last anchor was input field!\n"));
 	return;
     }
     if (a->number) {
@@ -4053,10 +4053,10 @@ PUBLIC void HText_endAnchor ARGS2(
 	     */
 	    a->show_anchor = NO;
 
-	    CTRACE(tfp,
+	    CTRACE((tfp,
 		   "HText_endAnchor: hidden (line,start,pos,ext,BlankExtent):(%d,%d,%d,%d,%d)",
 		   a->line_num,a->start,a->line_pos,a->extent,
-		   BlankExtent);
+		   BlankExtent));
 
 	    /*
 	     *  If links are numbered, then try to get rid of the
@@ -4283,10 +4283,10 @@ PUBLIC void HText_endAnchor ARGS2(
 	     */
 	    a->show_anchor = YES;
 	    if (BlankExtent) {
-		CTRACE(tfp,
+		CTRACE((tfp,
 		   "HText_endAnchor: blanks (line,start,pos,ext,BlankExtent):(%d,%d,%d,%d,%d)",
 		   a->line_num,a->start,a->line_pos,a->extent,
-		   BlankExtent);
+		   BlankExtent));
 	    }
 	}
 	if (a->show_anchor == NO) {
@@ -4314,11 +4314,11 @@ PUBLIC void HText_endAnchor ARGS2(
 					BlankExtent : 0);
 	}
 	if (BlankExtent || a->extent <= 0 || a->number <= 0) {
-	    CTRACE(tfp,
+	    CTRACE((tfp,
 		   "->[%d](%d,%d,%d,%d,%d)\n",
 		   a->number,
 		   a->line_num,a->start,a->line_pos,a->extent,
-		   BlankExtent);
+		   BlankExtent));
 	}
     } else {
 	/*
@@ -4385,7 +4385,7 @@ PUBLIC void HText_endAppend ARGS1(
     if (!text)
 	return;
 
-    CTRACE(tfp,"Gridtext: Entering HText_endAppend\n");
+    CTRACE((tfp,"Gridtext: Entering HText_endAppend\n"));
 
     /*
      *  Create a  blank line at the bottom.
@@ -4413,8 +4413,8 @@ PUBLIC void HText_endAppend ARGS1(
     while (text->last_line->data[0] == '\0' && text->Lines > 2) {
 	HTLine *next_to_the_last_line = text->last_line->prev;
 
-	CTRACE(tfp, "GridText: Removing bottom blank line: `%s'\n",
-			    text->last_line->data);
+	CTRACE((tfp, "GridText: Removing bottom blank line: `%s'\n",
+			    text->last_line->data));
 	/*
 	 *  line_ptr points to the first line.
 	 */
@@ -4423,8 +4423,8 @@ PUBLIC void HText_endAppend ARGS1(
 	FREE(text->last_line);
 	text->last_line = next_to_the_last_line;
 	text->Lines--;
-	CTRACE(tfp, "GridText: New bottom line: `%s'\n",
-			    text->last_line->data);
+	CTRACE((tfp, "GridText: New bottom line: `%s'\n",
+			    text->last_line->data));
     }
 
     /*
@@ -4472,8 +4472,8 @@ PUBLIC void HText_trimHightext ARGS2(
     if (!text)
 	return;
 
-    CTRACE(tfp, "Gridtext: Entering HText_trimHightext %s\n",
-		final ? "(final)" : "(partial)");
+    CTRACE((tfp, "Gridtext: Entering HText_trimHightext %s\n",
+		final ? "(final)" : "(partial)"));
 
     /*
      *  Get the first line.
@@ -4541,10 +4541,10 @@ re_parse:
 	    anchor_ptr->line_pos = 0;
 	    anchor_ptr->line_num = cur_line;
 	}
-	CTRACE(tfp,
+	CTRACE((tfp,
 	       "Gridtext: Anchor found on line:%d col:%d [%d] ext:%d\n",
 	       cur_line, anchor_ptr->line_pos,
-	       anchor_ptr->number, anchor_ptr->extent);
+	       anchor_ptr->number, anchor_ptr->extent));
 
 	cur_shift = 0;
 	/*
@@ -4566,7 +4566,7 @@ re_parse:
 	}
 	anchor_ptr->start += cur_shift;
 
-	CTRACE(tfp, "anchor text: '%s'\n", line_ptr->data);
+	CTRACE((tfp, "anchor text: '%s'\n", line_ptr->data));
 	/*
 	 *  If the link begins with an end of line and we have more
 	 *  lines, then start the highlighting on the next line. - FM
@@ -4580,10 +4580,10 @@ re_parse:
 		 anchor_ptr->line_pos != (int)line_ptr->size ||
 		 (prev_a && prev_a->start > anchor_ptr->start))) {
 		anchor_ptr->start++;
-		CTRACE(tfp, "found anchor at end of line\n");
+		CTRACE((tfp, "found anchor at end of line\n"));
 		goto re_parse;
 	    } else {
-		CTRACE(tfp, "found anchor at end of line, leaving it there\n");
+		CTRACE((tfp, "found anchor at end of line, leaving it there\n"));
 	    }
 	}
 
@@ -4665,9 +4665,9 @@ re_parse:
 	/*handle LY_SOFT_NEWLINEs -VH */
 	anchor_ptr->line_pos += have_soft_newline_in_1st_line;
 
-	CTRACE(tfp, "GridText:     add link on line %d col %d [%d] %s\n",
+	CTRACE((tfp, "GridText:     add link on line %d col %d [%d] %s\n",
 	       cur_line, anchor_ptr->line_pos,
-	       anchor_ptr->number, "in HText_trimHightext");
+	       anchor_ptr->number, "in HText_trimHightext"));
 
 	/*
 	 *  If this is the last anchor, we're done!
@@ -4816,17 +4816,17 @@ PUBLIC int HTGetRelLinkNum ARGS3(
      */
     int curanchor = links[cur].anchor_number;
 
-    CTRACE(tfp, "HTGetRelLinkNum(%d,%d,%d) -- HTMainText=%p\n",
-	   num, rel, cur, HTMainText);
-    CTRACE(tfp,"  scrtop=%d, curline=%d, curanchor=%d, display_lines=%d, %s\n",
+    CTRACE((tfp, "HTGetRelLinkNum(%d,%d,%d) -- HTMainText=%p\n",
+	   num, rel, cur, HTMainText));
+    CTRACE((tfp,"  scrtop=%d, curline=%d, curanchor=%d, display_lines=%d, %s\n",
 	   scrtop, curline, curanchor, display_lines,
-	   on_screen ? "on_screen" : "0");
+	   on_screen ? "on_screen" : "0"));
     if (!HTMainText) return 0;
     if ( rel==0 ) return num;
 
     /* if cur numbered link is on current page, use it */
     if ( on_screen && curanchor ) {
-	CTRACE(tfp,"curanchor=%d at line %d on screen\n",curanchor,curline);
+	CTRACE((tfp,"curanchor=%d at line %d on screen\n",curanchor,curline));
 	if ( rel == '+' ) return curanchor + num;
 	else if ( rel == '-' ) return curanchor - num;
 	else return num; /* shouldn't happen */
@@ -4836,13 +4836,13 @@ PUBLIC int HTGetRelLinkNum ARGS3(
      * -- find previous closest numbered link
      */
     for (a = HTMainText->first_anchor; a; a = a->next) {
-	CTRACE(tfp,"  a->line_num=%d, a->number=%d\n",a->line_num,a->number);
+	CTRACE((tfp,"  a->line_num=%d, a->number=%d\n",a->line_num,a->number));
 	if ( a->line_num >= scrtop ) break;
 	if ( a->number == 0 ) continue;
 	l = a;
 	curanchor = l->number;
     }
-    CTRACE(tfp,"  a=%p, l=%p, curanchor=%d\n",a,l,curanchor);
+    CTRACE((tfp,"  a=%p, l=%p, curanchor=%d\n",a,l,curanchor));
     if ( on_screen ) { /* on screen but not a numbered link */
 	for ( ;  a;  a = a->next ) {
 	    if ( a->number ) { l = a; curanchor = l->number; }
@@ -5006,8 +5006,8 @@ PUBLIC int HTGetLinkInfo ARGS6(
 				(HTAnchor *)a->anchor, LINK_INTERNAL);
 			    if (link_dest_intl && link_dest_intl != link_dest) {
 
-				CTRACE(tfp, "HTGetLinkInfo: unexpected typed link to %s!\n",
-					    link_dest_intl->parent->address);
+				CTRACE((tfp, "HTGetLinkInfo: unexpected typed link to %s!\n",
+					    link_dest_intl->parent->address));
 				link_dest_intl = NULL;
 			    }
 			}
@@ -5643,7 +5643,7 @@ PUBLIC void HText_pageDisplay ARGS2(
 {
 #ifdef DISP_PARTIAL
     if (debug_display_partial || (LYTraceLogFP != NULL)) {
-	CTRACE(tfp, "GridText: HText_pageDisplay at line %d started\n", line_num);
+	CTRACE((tfp, "GridText: HText_pageDisplay at line %d started\n", line_num));
     }
 
     if (display_partial) {
@@ -5671,7 +5671,7 @@ PUBLIC void HText_pageDisplay ARGS2(
 
 #ifdef DISP_PARTIAL
     if (debug_display_partial || (LYTraceLogFP != NULL)) {
-	CTRACE(tfp, "GridText: HText_pageDisplay finished\n");
+	CTRACE((tfp, "GridText: HText_pageDisplay finished\n"));
     }
 #endif
 }
@@ -5895,9 +5895,9 @@ PUBLIC BOOL HTFindPoundSelector ARGS1(
 
 		www_search_result = a->line_num+1;
 
-		CTRACE(tfp,
+		CTRACE((tfp,
 		       "HText: Selecting anchor [%d] at character %d, line %d\n",
-				     a->number, a->start, www_search_result);
+				     a->number, a->start, www_search_result));
 		if (!strcmp(selector, LYToolbarName))
 		    --www_search_result;
 
@@ -5926,7 +5926,7 @@ PUBLIC BOOL HText_selectAnchor ARGS2(
 	if (a->anchor == anchor) break;
     }
     if (!a) {
-	CTRACE(tfp, "HText: No such anchor in this text!\n");
+	CTRACE((tfp, "HText: No such anchor in this text!\n"));
 	return NO;
     }
 
@@ -5937,9 +5937,9 @@ PUBLIC BOOL HText_selectAnchor ARGS2(
 
     {
 	 int l = line_for_char(text, a->start);
-	 CTRACE(tfp,
+	 CTRACE((tfp,
 	    "HText: Selecting anchor [%d] at character %d, line %d\n",
-	    a->number, a->start, l);
+	    a->number, a->start, l));
 
 	if ( !text->stale &&
 	     (l >= text->top_of_screen) &&
@@ -6298,7 +6298,7 @@ get_query:
 	StrAllocCopy(doc->address, cp_freeme);
 	FREE(cp_freeme);
 
-	CTRACE(tfp,"\ndo_www_search: newfile: %s\n",doc->address);
+	CTRACE((tfp,"\ndo_www_search: newfile: %s\n",doc->address));
 
 	/*
 	 *  Yah, the search succeeded.
@@ -6950,18 +6950,18 @@ PUBLIC void HTuncache_current_document NOARGS
 		FREE(htmain_anchor->UCStages);
 	    }
 	}
-	CTRACE(tfp, "\nHTuncache.. freeing document for '%s'%s\n",
+	CTRACE((tfp, "\nHTuncache.. freeing document for '%s'%s\n",
 			    ((htmain_anchor &&
 			      htmain_anchor->address) ?
 			       htmain_anchor->address : "unknown anchor"),
 			    ((htmain_anchor &&
 			      htmain_anchor->post_data) ?
-				      " with POST data" : ""));
+				      " with POST data" : "")));
 	HTList_removeObject(loaded_texts, HTMainText);
 	HText_free(HTMainText);
 	HTMainText = NULL;
     } else {
-	CTRACE(tfp, "HTuncache.. HTMainText already is NULL!\n");
+	CTRACE((tfp, "HTuncache.. HTMainText already is NULL!\n"));
     }
 }
 
@@ -6982,8 +6982,8 @@ PUBLIC BOOLEAN HTreparse_document NOARGS
 	HTFormat format;
 	int ret;
 
-	CTRACE(tfp, "Reparsing source cache file %s\n",
-	      HTMainAnchor->source_cache_file);
+	CTRACE((tfp, "Reparsing source cache file %s\n",
+	      HTMainAnchor->source_cache_file));
 
 	/*
 	 * This magic FREE(anchor->UCStages) call
@@ -7007,11 +7007,11 @@ PUBLIC BOOLEAN HTreparse_document NOARGS
 	     * documents...
 	     */
 	}
-	CTRACE(tfp, "  Content type is \"%s\"\n", format->name);
+	CTRACE((tfp, "  Content type is \"%s\"\n", format->name));
 
 	fp = fopen(HTMainAnchor->source_cache_file, "r");
 	if (!fp) {
-	   CTRACE(tfp, "  Cannot read file %s\n", HTMainAnchor->source_cache_file);
+	   CTRACE((tfp, "  Cannot read file %s\n", HTMainAnchor->source_cache_file));
 	   FREE(HTMainAnchor->source_cache_file);
 	    return FALSE;
 	}
@@ -7036,8 +7036,8 @@ PUBLIC BOOLEAN HTreparse_document NOARGS
 	HTFormat format = WWW_HTML;
 	int ret;
 
-	CTRACE(tfp, "Reparsing from source memory cache %p\n",
-		    (void *)HTMainAnchor->source_cache_chunk);
+	CTRACE((tfp, "Reparsing from source memory cache %p\n",
+		    (void *)HTMainAnchor->source_cache_chunk));
 
 	/*
 	 * This magic FREE(anchor->UCStages) call
@@ -7074,7 +7074,7 @@ PUBLIC BOOLEAN HTreparse_document NOARGS
 	ok = (BOOL) (ret == HT_LOADED);
     }
 
-    CTRACE(tfp, "Reparse %s\n", (ok ? "succeeded" : "failed"));
+    CTRACE((tfp, "Reparse %s\n", (ok ? "succeeded" : "failed")));
 
     if (ok)  {
 	from_source_cache = TRUE;  /* flag for mainloop events */
@@ -7117,8 +7117,8 @@ PRIVATE void trace_setting_change ARGS3(
 	BOOLEAN,	new_setting)
 {
     if (prev_setting != new_setting)
-	CTRACE(tfp, "HTdocument_settings_changed: %s setting has changed (was %s, now %s)\n",
-	       name, prev_setting ? "ON" : "OFF", new_setting ? "ON" : "OFF");
+	CTRACE((tfp, "HTdocument_settings_changed: %s setting has changed (was %s, now %s)\n",
+	       name, prev_setting ? "ON" : "OFF", new_setting ? "ON" : "OFF"));
 }
 
 PUBLIC BOOLEAN HTdocument_settings_changed NOARGS
@@ -7159,9 +7159,9 @@ PUBLIC BOOLEAN HTdocument_settings_changed NOARGS
 	trace_setting_change("KEYPAD_MODE",
 			     HTMainText->keypad_mode, keypad_mode);
 	if (HTMainText->lines != LYlines || HTMainText->cols != LYcols)
-	    CTRACE(tfp,
+	    CTRACE((tfp,
 		   "HTdocument_settings_changed: Screen size has changed (was %dx%d, now %dx%d)\n",
-		   HTMainText->cols, HTMainText->lines, LYcols, LYlines);
+		   HTMainText->cols, HTMainText->lines, LYcols, LYlines));
     }
 
     return (HTMainText->clickable_images != clickable_images ||
@@ -7642,14 +7642,14 @@ PUBLIC void HText_beginForm ARGS5(
     PerFormInfo_free(HTCurrentForm); /* shouldn't happen here - kw */
     HTCurrentForm = newform;
 
-    CTRACE(tfp, "BeginForm: action:%s Method:%d%s%s%s%s%s%s\n",
+    CTRACE((tfp, "BeginForm: action:%s Method:%d%s%s%s%s%s%s\n",
 		HTFormAction, HTFormMethod,
 		(HTFormTitle ? " Title:" : ""),
 		(HTFormTitle ? HTFormTitle : ""),
 		(HTFormEnctype ? " Enctype:" : ""),
 		(HTFormEnctype ? HTFormEnctype : ""),
 		(HTFormAcceptCharset ? " Accept-charset:" : ""),
-		(HTFormAcceptCharset ? HTFormAcceptCharset : ""));
+		(HTFormAcceptCharset ? HTFormAcceptCharset : "")));
 }
 
 PUBLIC void HText_endForm ARGS1(
@@ -7707,7 +7707,7 @@ PUBLIC void HText_endForm ARGS1(
 	HTList_appendObject(text->forms, HTCurrentForm);
 	HTCurrentForm = NULL;
     } else {
-	CTRACE(tfp, "endForm:    HTCurrentForm is missing!\n");
+	CTRACE((tfp, "endForm:    HTCurrentForm is missing!\n"));
     }
 
     FREE(HTCurSelectGroup);
@@ -7749,16 +7749,16 @@ PUBLIC void HText_beginSelect ARGS4(
      */
     StrAllocCopy(HTCurSelectGroupSize, size);
 
-    CTRACE(tfp,"HText_beginSelect: name=%s type=%d size=%s\n",
+    CTRACE((tfp,"HText_beginSelect: name=%s type=%d size=%s\n",
 	       ((HTCurSelectGroup == NULL) ?
 				  "<NULL>" : HTCurSelectGroup),
 		HTCurSelectGroupType,
 	       ((HTCurSelectGroupSize == NULL) ?
-				      "<NULL>" : HTCurSelectGroupSize));
-    CTRACE(tfp,"HText_beginSelect: name_cs=%d \"%s\"\n",
+				      "<NULL>" : HTCurSelectGroupSize)));
+    CTRACE((tfp,"HText_beginSelect: name_cs=%d \"%s\"\n",
 		HTCurSelectGroupCharset,
 		(HTCurSelectGroupCharset >= 0 ?
-		 LYCharSet_UC[HTCurSelectGroupCharset].MIMEname : "<UNKNOWN>"));
+		 LYCharSet_UC[HTCurSelectGroupCharset].MIMEname : "<UNKNOWN>")));
 }
 
 /*
@@ -7783,7 +7783,7 @@ PUBLIC int HText_getOptionNum ARGS1(
 
     for (op = a->input_field->select_list; op; op = op->next)
 	n++;
-    CTRACE(tfp, "HText_getOptionNum: Got number '%d'.\n", n);
+    CTRACE((tfp, "HText_getOptionNum: Got number '%d'.\n", n));
     return(n);
 }
 
@@ -7860,13 +7860,13 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
 
     if (!(text && text->last_anchor &&
 	  text->last_anchor->link_type == INPUT_ANCHOR)) {
-	CTRACE(tfp, "HText_setLastOptionValue: invalid call!  value:%s!\n",
-		    (value ? value : "<NULL>"));
+	CTRACE((tfp, "HText_setLastOptionValue: invalid call!  value:%s!\n",
+		    (value ? value : "<NULL>")));
 	return NULL;
     }
 
-    CTRACE(tfp, "Entering HText_setLastOptionValue: value:%s, checked:%s\n",
-		value, (checked ? "on" : "off"));
+    CTRACE((tfp, "Entering HText_setLastOptionValue: value:%s, checked:%s\n",
+		value, (checked ? "on" : "off")));
 
     /*
      *  Strip end spaces, newline is also whitespace.
@@ -7943,10 +7943,10 @@ PUBLIC char * HText_setLastOptionValue ARGS7(
 	     *  No option items yet.
 	     */
 	    if (text->last_anchor->input_field->type != F_OPTION_LIST_TYPE) {
-		CTRACE(tfp, "HText_setLastOptionValue: last input_field not F_OPTION_LIST_TYPE (%d)\n",
-			    F_OPTION_LIST_TYPE);
-		CTRACE(tfp, "                          but %d, ignoring!\n",
-			    text->last_anchor->input_field->type);
+		CTRACE((tfp, "HText_setLastOptionValue: last input_field not F_OPTION_LIST_TYPE (%d)\n",
+			    F_OPTION_LIST_TYPE));
+		CTRACE((tfp, "                          but %d, ignoring!\n",
+			    text->last_anchor->input_field->type));
 		return NULL;
 	    }
 
@@ -8131,7 +8131,7 @@ PUBLIC int HText_beginInput ARGS3(
     unsigned char *tmp = NULL;
     int i, j;
 
-    CTRACE(tfp, "GridText: Entering HText_beginInput\n");
+    CTRACE((tfp, "GridText: Entering HText_beginInput\n"));
 
     if (a == NULL || f == NULL)
 	outofmem(__FILE__, "HText_beginInput");
@@ -8324,7 +8324,7 @@ PUBLIC int HText_beginInput ARGS3(
 	    f->type = F_RANGE_TYPE;
 	} else if (!strcasecomp(I->type,"file")) {
 	    f->type = F_FILE_TYPE;
-	    CTRACE(tfp, "ok, got a file uploader\n");
+	    CTRACE((tfp, "ok, got a file uploader\n"));
 	} else if (!strcasecomp(I->type,"keygen")) {
 	    f->type = F_KEYGEN_TYPE;
 	} else {
@@ -8355,8 +8355,8 @@ PUBLIC int HText_beginInput ARGS3(
 	    /*
 	     *  Error!  NAME must be present.
 	     */
-	    CTRACE(tfp,
-		  "GridText: No name present in input field; not displaying\n");
+	    CTRACE((tfp,
+		  "GridText: No name present in input field; not displaying\n"));
 	    FREE(a);
 	    FREE(f);
 	    FREE(IValue);
@@ -8584,27 +8584,27 @@ PUBLIC int HText_beginInput ARGS3(
 	    text->forms = HTList_new();
 	}
     } else {
-	CTRACE(tfp, "beginInput: HTCurrentForm is missing!\n");
+	CTRACE((tfp, "beginInput: HTCurrentForm is missing!\n"));
     }
 
-    CTRACE(tfp, "Input link: name=%s\nvalue=%s\nsize=%d\n",
+    CTRACE((tfp, "Input link: name=%s\nvalue=%s\nsize=%d\n",
 			f->name,
 			((f->value != NULL) ? f->value : ""),
-			f->size);
-    CTRACE(tfp, "Input link: name_cs=%d \"%s\" (from %d \"%s\")\n",
+			f->size));
+    CTRACE((tfp, "Input link: name_cs=%d \"%s\" (from %d \"%s\")\n",
 			f->name_cs,
 			(f->name_cs >= 0 ?
 			 LYCharSet_UC[f->name_cs].MIMEname : "<UNKNOWN>"),
 			I->name_cs,
 			(I->name_cs >= 0 ?
-			 LYCharSet_UC[I->name_cs].MIMEname : "<UNKNOWN>"));
-    CTRACE(tfp, "            value_cs=%d \"%s\" (from %d \"%s\")\n",
+			 LYCharSet_UC[I->name_cs].MIMEname : "<UNKNOWN>")));
+    CTRACE((tfp, "            value_cs=%d \"%s\" (from %d \"%s\")\n",
 			f->value_cs,
 			(f->value_cs >= 0 ?
 			 LYCharSet_UC[f->value_cs].MIMEname : "<UNKNOWN>"),
 			I->value_cs,
 			(I->value_cs >= 0 ?
-			 LYCharSet_UC[I->value_cs].MIMEname : "<UNKNOWN>"));
+			 LYCharSet_UC[I->value_cs].MIMEname : "<UNKNOWN>")));
 
     /*
      *  Return the SIZE of the input field.
@@ -8753,18 +8753,18 @@ PUBLIC int HText_SubmitForm ARGS4(
     char *copied_val_used = NULL;
     char *copied_name_used = NULL;
 
-    CTRACE(tfp, "FIXME:SubmitForm\n");
+    CTRACE((tfp, "FIXME:SubmitForm\n"));
     if (!HTMainText)
 	return 0;
 
     thisform = HTList_objectAt(HTMainText->forms, form_number - 1);
     /*  Sanity check */
     if (!thisform) {
-	CTRACE(tfp, "SubmitForm: form %d not in HTMainText's list!\n",
-		    form_number);
+	CTRACE((tfp, "SubmitForm: form %d not in HTMainText's list!\n",
+		    form_number));
     } else if (thisform->number != form_number) {
-	CTRACE(tfp, "SubmitForm: failed sanity check, %d!=%d !\n",
-		    thisform->number, form_number);
+	CTRACE((tfp, "SubmitForm: failed sanity check, %d!=%d !\n",
+		    thisform->number, form_number));
 	thisform = NULL;
     }
 
@@ -9064,13 +9064,13 @@ PUBLIC int HText_SubmitForm ARGS4(
 		case F_IMAGE_SUBMIT_TYPE:
 		    if (!(form_ptr->name && *form_ptr->name != '\0' &&
 			  !strcmp(form_ptr->name, link_name))) {
-			CTRACE(tfp,
-				    "SubmitForm: skipping submit field with ");
-			CTRACE(tfp, "name \"%s\" for link_name \"%s\", %s.\n",
+			CTRACE((tfp,
+				    "SubmitForm: skipping submit field with "));
+			CTRACE((tfp, "name \"%s\" for link_name \"%s\", %s.\n",
 				    form_ptr->name ? form_ptr->name : "???",
 				    link_name ? link_name : "???",
 				    (form_ptr->name && *form_ptr->name) ?
-				    "not current link" : "no field name");
+				    "not current link" : "no field name"));
 			break;
 		    }
 		    if (!(form_ptr->type == F_TEXT_SUBMIT_TYPE ||
@@ -9090,7 +9090,7 @@ PUBLIC int HText_SubmitForm ARGS4(
 
 #ifdef EXP_FILE_UPLOAD
 		case F_FILE_TYPE:
-		    CTRACE(tfp, "I'd submit %s (from %s), but you've not finished it\n", form_ptr->value, form_ptr->name);
+		    CTRACE((tfp, "I'd submit %s (from %s), but you've not finished it\n", form_ptr->value, form_ptr->name));
 		    name_used = (form_ptr->name ? form_ptr->name : "");
 		    val_used = (form_ptr->value ? form_ptr->value : "");
 		    break;
@@ -9138,7 +9138,7 @@ PUBLIC int HText_SubmitForm ARGS4(
 			success = LYUCTranslateBackFormData(&copied_val_used,
 							form_ptr->value_cs,
 							target_cs, PlainText);
-			CTRACE(tfp, "SubmitForm: field \"%s\" %d %s -> %d %s %s\n",
+			CTRACE((tfp, "SubmitForm: field \"%s\" %d %s -> %d %s %s\n",
 				    form_ptr->name ? form_ptr->name : "",
 				    form_ptr->value_cs,
 				    form_ptr->value_cs >= 0 ?
@@ -9146,15 +9146,15 @@ PUBLIC int HText_SubmitForm ARGS4(
 									  "???",
 				    target_cs,
 				    target_csname ? target_csname : "???",
-				    success ? "OK" : "FAILED");
+				    success ? "OK" : "FAILED"));
 			if (success) {
 			    val_used = copied_val_used;
 			}
 		    } else {  /* We can use the value directly. */
-			CTRACE(tfp, "SubmitForm: field \"%s\" %d %s OK\n",
+			CTRACE((tfp, "SubmitForm: field \"%s\" %d %s OK\n",
 				    form_ptr->name ? form_ptr->name : "",
 				    target_cs,
-				    target_csname ? target_csname : "???");
+				    target_csname ? target_csname : "???"));
 			success = YES;
 		    }
 		    if (!success) {
@@ -9228,7 +9228,7 @@ PUBLIC int HText_SubmitForm ARGS4(
 			success = LYUCTranslateBackFormData(&copied_name_used,
 							form_ptr->name_cs,
 							target_cs, PlainText);
-			CTRACE(tfp, "SubmitForm: name \"%s\" %d %s -> %d %s %s\n",
+			CTRACE((tfp, "SubmitForm: name \"%s\" %d %s -> %d %s %s\n",
 				    form_ptr->name ? form_ptr->name : "",
 				    form_ptr->name_cs,
 				    form_ptr->name_cs >= 0 ?
@@ -9236,7 +9236,7 @@ PUBLIC int HText_SubmitForm ARGS4(
 									  "???",
 				    target_cs,
 				    target_csname ? target_csname : "???",
-				    success ? "OK" : "FAILED");
+				    success ? "OK" : "FAILED"));
 			if (success) {
 			    name_used = copied_name_used;
 			}
@@ -9250,10 +9250,10 @@ PUBLIC int HText_SubmitForm ARGS4(
 			    }
 			}
 		    } else {  /* We can use the name directly. */
-			CTRACE(tfp, "SubmitForm: name \"%s\" %d %s OK\n",
+			CTRACE((tfp, "SubmitForm: name \"%s\" %d %s OK\n",
 				    form_ptr->name ? form_ptr->name : "",
 				    target_cs,
-				    target_csname ? target_csname : "???");
+				    target_csname ? target_csname : "???"));
 			success = YES;
 			if (Boundary) {
 			    StrAllocCopy(copied_name_used, name_used);
@@ -9287,8 +9287,8 @@ PUBLIC int HText_SubmitForm ARGS4(
 
 		    break;
 		default:
-		    CTRACE(tfp, "SubmitForm: What type is %d?\n",
-				form_ptr->type);
+		    CTRACE((tfp, "SubmitForm: What type is %d?\n",
+				form_ptr->type));
 		}
 
 		switch(form_ptr->type) {
@@ -9304,7 +9304,7 @@ PUBLIC int HText_SubmitForm ARGS4(
 		    int bytes;
 		    char buffer[257];
 
-		    CTRACE(tfp, "Ok, about to convert %s to mime/thingy\n", form_ptr->value);
+		    CTRACE((tfp, "Ok, about to convert %s to mime/thingy\n", form_ptr->value));
 		    if (first_one) {
 			if (Boundary) {
 			    HTSprintf(&query, "--%s\r\n", Boundary);
@@ -9712,19 +9712,19 @@ PUBLIC int HText_SubmitForm ARGS4(
     }
     FREE(previous_blanks);
 
-    CTRACE(tfp, "QUERY (%d) >> \n%s\n", strlen(query), query);
+    CTRACE((tfp, "QUERY (%d) >> \n%s\n", strlen(query), query));
 
     if (submit_item->submit_method == URL_MAIL_METHOD) {
 	HTUserMsg2(gettext("Submitting %s"), submit_item->submit_action);
-	CTRACE(tfp, "\nGridText - mailto_address: %s\n",
-			    (submit_item->submit_action+7));
-	CTRACE(tfp, "GridText - mailto_subject: %s\n",
+	CTRACE((tfp, "\nGridText - mailto_address: %s\n",
+			    (submit_item->submit_action+7)));
+	CTRACE((tfp, "GridText - mailto_subject: %s\n",
 			    ((submit_item->submit_title &&
 			      *submit_item->submit_title) ?
 			      (submit_item->submit_title) :
 					(HText_getTitle() ?
-					 HText_getTitle() : "")));
-	CTRACE(tfp,"GridText - mailto_content: %s\n",query);
+					 HText_getTitle() : ""))));
+	CTRACE((tfp,"GridText - mailto_content: %s\n",query));
 	mailform((submit_item->submit_action+7),
 		 ((submit_item->submit_title &&
 		   *submit_item->submit_title) ?
@@ -9742,7 +9742,7 @@ PUBLIC int HText_SubmitForm ARGS4(
 
     if (submit_item->submit_method == URL_POST_METHOD || Boundary) {
 	StrAllocCopy(doc->post_data, query);
-	CTRACE(tfp,"GridText - post_data: %s\n",doc->post_data);
+	CTRACE((tfp,"GridText - post_data: %s\n",doc->post_data));
 	StrAllocCopy(doc->address, submit_item->submit_action);
 	FREE(query);
 	return 1;
@@ -10736,7 +10736,7 @@ PRIVATE void update_subsequent_anchors ARGS4(
     int      hang_detect = 100000;  /* ditto */
 
 
-    CTRACE(tfp, "GridText: adjusting struct's to add %d new line(s)\n", n);
+    CTRACE((tfp, "GridText: adjusting struct's to add %d new line(s)\n", n));
 
     /*
      *  Update numeric fields of the rest of the anchors.
@@ -10845,7 +10845,7 @@ exit:
 
     more = HText_canScrollDown();
 
-    CTRACE(tfp, "GridText: TextAnchor and HTLine struct's adjusted\n");
+    CTRACE((tfp, "GridText: TextAnchor and HTLine struct's adjusted\n"));
 
     return;
 
@@ -10907,7 +10907,7 @@ PUBLIC int HText_ExtEditForm ARGS1(
     int		newlines  = 0;
     int		len;
 
-    CTRACE(tfp, "GridText: entered HText_ExtEditForm()\n");
+    CTRACE((tfp, "GridText: entered HText_ExtEditForm()\n"));
 
     ed_temp = (char *) malloc (LY_MAXPATH);
     if ((fp = LYOpenTemp (ed_temp, "", "w")) == 0) {
@@ -10962,8 +10962,8 @@ PUBLIC int HText_ExtEditForm ARGS1(
     }
     LYCloseTempFP (fp);
 
-    CTRACE(tfp, "GridText: TEXTAREA name=|%s| dumped to tempfile\n", areaname);
-    CTRACE(tfp, "GridText: invoking editor (%s) on tempfile\n", editor);
+    CTRACE((tfp, "GridText: TEXTAREA name=|%s| dumped to tempfile\n", areaname));
+    CTRACE((tfp, "GridText: invoking editor (%s) on tempfile\n", editor));
 
     /*
      *	Go edit the TEXTAREA temp file, with the initial editor line
@@ -10998,7 +10998,7 @@ PUBLIC int HText_ExtEditForm ARGS1(
 #endif
     FREE(tbuf);
 
-    CTRACE(tfp, "GridText: returned from editor (%s)\n", editor);
+    CTRACE((tfp, "GridText: returned from editor (%s)\n", editor));
 
     /*
      *	Read back the edited temp file into our buffer.
@@ -11092,7 +11092,7 @@ PUBLIC int HText_ExtEditForm ARGS1(
 	line_cnt++;
     }
 
-    CTRACE(tfp, "GridText: edited text inserted into lynx struct's\n");
+    CTRACE((tfp, "GridText: edited text inserted into lynx struct's\n"));
 
     /*
      *	If we've added any new lines/anchors, we need to adjust various
@@ -11110,7 +11110,7 @@ PUBLIC int HText_ExtEditForm ARGS1(
     LYRemoveTemp (ed_temp);
     FREE(ed_temp);
 
-    CTRACE(tfp, "GridText: exiting HText_ExtEditForm()\n");
+    CTRACE((tfp, "GridText: exiting HText_ExtEditForm()\n"));
 
     /*
      *  Return the offset needed to move the cursor from its current
@@ -11146,7 +11146,7 @@ PUBLIC void HText_ExpandTextarea ARGS2(
     int       i;
 
 
-    CTRACE(tfp, "GridText: entered HText_ExpandTextarea()\n");
+    CTRACE((tfp, "GridText: entered HText_ExpandTextarea()\n"));
 
     if (newlines < 1) return;
 
@@ -11203,8 +11203,8 @@ PUBLIC void HText_ExpandTextarea ARGS2(
 	   match_tag = end_anchor->next->number;
     }
 
-    CTRACE(tfp, "GridText: %d blank line(s) added to TEXTAREA name=|%s|\n",
-		newlines, areaname);
+    CTRACE((tfp, "GridText: %d blank line(s) added to TEXTAREA name=|%s|\n",
+		newlines, areaname));
 
     /*
      *	We need to adjust various things in all anchor bearing lines
@@ -11212,7 +11212,7 @@ PUBLIC void HText_ExpandTextarea ARGS2(
      */
     update_subsequent_anchors (newlines, end_anchor, htline, match_tag);
 
-    CTRACE(tfp, "GridText: exiting HText_ExpandTextarea()\n");
+    CTRACE((tfp, "GridText: exiting HText_ExpandTextarea()\n"));
 
     return;
 }
@@ -11263,14 +11263,14 @@ PUBLIC int HText_InsertFile ARGS1(
     int		i;
 
 
-    CTRACE(tfp, "GridText: entered HText_InsertFile()\n");
+    CTRACE((tfp, "GridText: entered HText_InsertFile()\n"));
 
     /*
      * Get the filename of the insert file.
      */
     if (!(fn = GetFileName())) {
 	HTInfoMsg (FILE_INSERT_CANCELLED);
-	CTRACE(tfp, "GridText: file insert cancelled - no filename provided\n");
+	CTRACE((tfp, "GridText: file insert cancelled - no filename provided\n"));
 	return (0);
     }
     if (no_dotfiles || !show_dotfiles) {
@@ -11286,8 +11286,8 @@ PUBLIC int HText_InsertFile ARGS1(
     if ((stat (fn, &stat_info) < 0)        ||
 	((size = stat_info.st_size) == 0)) {
 	HTInfoMsg (FILE_INSERT_0_LENGTH);
-	CTRACE(tfp, "GridText: file insert aborted - file=|%s|- was 0-length\n",
-		    fn);
+	CTRACE((tfp, "GridText: file insert aborted - file=|%s|- was 0-length\n",
+		    fn));
 	FREE(fn);
 	return (0);
 
@@ -11482,7 +11482,7 @@ PUBLIC int HText_InsertFile ARGS1(
 	anchor_ptr  = anchor_ptr->next;
     }
 
-    CTRACE(tfp, "GridText: file inserted into lynx struct's\n");
+    CTRACE((tfp, "GridText: file inserted into lynx struct's\n"));
 
     /*
      *	Now adjust various things in all anchor-bearing lines following the
@@ -11497,7 +11497,7 @@ PUBLIC int HText_InsertFile ARGS1(
     FREE(line);
     FREE(fbuf);
 
-    CTRACE(tfp, "GridText: exiting HText_InsertFile()\n");
+    CTRACE((tfp, "GridText: exiting HText_InsertFile()\n"));
 
     return (newlines);
 }
diff --git a/src/HTAlert.c b/src/HTAlert.c
index b9f8e746..5a86f666 100644
--- a/src/HTAlert.c
+++ b/src/HTAlert.c
@@ -32,7 +32,7 @@
 PUBLIC void HTAlert ARGS1(
 	CONST char *,	Msg)
 {
-    CTRACE(tfp, "\nAlert!: %s\n\n", Msg);
+    CTRACE((tfp, "\nAlert!: %s\n\n", Msg));
     CTRACE_FLUSH(tfp);
     _user_message(ALERT_FORMAT, Msg);
     LYstore_message2(ALERT_FORMAT, Msg);
@@ -63,7 +63,7 @@ PUBLIC void HTAlwaysAlert ARGS2(
 	    sleep(AlertSecs);
 	    fprintf(((TRACE) ? stdout : stderr), "\n");
 	}
-	CTRACE(tfp, "\nAlert!: %s\n\n", Msg);
+	CTRACE((tfp, "\nAlert!: %s\n\n", Msg));
 	CTRACE_FLUSH(tfp);
     }
 }
@@ -76,7 +76,7 @@ PUBLIC void HTInfoMsg ARGS1(
 {
     _statusline(Msg);
     if (Msg && *Msg) {
-	CTRACE(tfp, "Info message: %s\n", Msg);
+	CTRACE((tfp, "Info message: %s\n", Msg));
 	LYstore_message(Msg);
 	sleep(InfoSecs);
     }
@@ -90,7 +90,7 @@ PUBLIC void HTUserMsg ARGS1(
 {
     _statusline(Msg);
     if (Msg && *Msg) {
-	CTRACE(tfp, "User message: %s\n", Msg);
+	CTRACE((tfp, "User message: %s\n", Msg));
 	LYstore_message(Msg);
 	sleep(MessageSecs);
     }
@@ -102,9 +102,9 @@ PUBLIC void HTUserMsg2 ARGS2(
 {
     _user_message(Msg2, Arg);
     if (Msg2 && *Msg2) {
-	CTRACE(tfp, "User message: ");
-	CTRACE(tfp, Msg2, Arg);
-	CTRACE(tfp, "\n");
+	CTRACE((tfp, "User message: "));
+	CTRACE((tfp, Msg2, Arg));
+	CTRACE((tfp, "\n"));
 	LYstore_message2(Msg2, Arg);
 	sleep(MessageSecs);
     }
@@ -165,7 +165,7 @@ PUBLIC void HTProgress ARGS1(
 {
     statusline(Msg);
     LYstore_message(Msg);
-    CTRACE(tfp, "%s\n", Msg);
+    CTRACE((tfp, "%s\n", Msg));
 #if defined(SH_EX) && defined(WIN_EX)	/* 1997/10/11 (Sat) 12:51:02 */
     {
 	if (debug_delay != 0)
@@ -351,7 +351,7 @@ PUBLIC void HTReadProgress ARGS2(
 
 	    /* do not store the message for history page. */
 	    statusline(line);
-	    CTRACE(tfp, "%s\n", line);
+	    CTRACE((tfp, "%s\n", line));
 	}
     }
 #else /* !EXP_READPROGRESS */
@@ -414,7 +414,7 @@ PUBLIC void HTReadProgress ARGS2(
 
 	    /* do not store the message for history page. */
 	    statusline(line);
-	    CTRACE(tfp, "%s\n", line);
+	    CTRACE((tfp, "%s\n", line));
 	}
     }
 #endif /* EXP_READPROGRESS */
@@ -447,11 +447,11 @@ PUBLIC int HTConfirmDefault ARGS2(CONST char *, Msg, int, Dft)
     conf_cancelled = NO;
     if (dump_output_immediately) { /* Non-interactive, can't respond */
 	if (Dft == DFT_CONFIRM) {
-	    CTRACE(tfp, "Confirm: %s (%c/%c) ", Msg, *msg_yes, *msg_no);
+	    CTRACE((tfp, "Confirm: %s (%c/%c) ", Msg, *msg_yes, *msg_no));
 	} else {
-	    CTRACE(tfp, "Confirm: %s (%c) ", Msg, (Dft == YES) ? *msg_yes : *msg_no);
+	    CTRACE((tfp, "Confirm: %s (%c) ", Msg, (Dft == YES) ? *msg_yes : *msg_no));
 	}
-	CTRACE(tfp, "- NO, not interactive.\n");
+	CTRACE((tfp, "- NO, not interactive.\n"));
 	result = NO;
     } else {
 	char *msg = NULL;
@@ -461,7 +461,7 @@ PUBLIC int HTConfirmDefault ARGS2(CONST char *, Msg, int, Dft)
 	else
 	    HTSprintf0(&msg, "%s (%c) ", Msg, (Dft == YES) ? *msg_yes : *msg_no);
 	if (LYTraceLogFP) {
-	    CTRACE(tfp, "Confirm: %s", msg);
+	    CTRACE((tfp, "Confirm: %s", msg));
 	}
 	_statusline(msg);
 	FREE(msg);
@@ -486,9 +486,9 @@ PUBLIC int HTConfirmDefault ARGS2(CONST char *, Msg, int, Dft)
 		break;
 	    }
 	}
-	CTRACE(tfp, "- %s%s.\n",
+	CTRACE((tfp, "- %s%s.\n",
 	       (result != NO) ? "YES" : "NO",
-	       conf_cancelled ? ", cancelled" : "");
+	       conf_cancelled ? ", cancelled" : ""));
     }
     return (result);
 }
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index d55d53de..8b1308c1 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -433,11 +433,11 @@ PRIVATE void HTFWriter_abort ARGS2(
 	HTStream *,	me,
 	HTError,	e GCC_UNUSED)
 {
-    CTRACE(tfp,"HTFWriter_abort called\n");
+    CTRACE((tfp,"HTFWriter_abort called\n"));
     LYCloseTempFP(me->fp);
     FREE(me->viewer_command);
     if (me->end_command) {		/* Temp file */
-	CTRACE(tfp, "HTFWriter: Aborting: file not executed.\n");
+	CTRACE((tfp, "HTFWriter: Aborting: file not executed.\n"));
 	FREE(me->end_command);
 	if (me->remove_command) {
 	    LYSystem(me->remove_command);
diff --git a/src/HTInit.c b/src/HTInit.c
index 6a82af9a..811af8b5 100644
--- a/src/HTInit.c
+++ b/src/HTInit.c
@@ -311,8 +311,8 @@ PRIVATE int ProcessMailcapEntry ARGS2(
     }
     s = strchr(rawentry, ';');
     if (s == NULL) {
-	CTRACE(tfp, "ProcessMailcapEntry: Ignoring invalid mailcap entry: %s\n",
-		    rawentry);
+	CTRACE((tfp, "ProcessMailcapEntry: Ignoring invalid mailcap entry: %s\n",
+		    rawentry));
 	FREE(rawentry);
 	return(0);
     }
@@ -321,8 +321,8 @@ PRIVATE int ProcessMailcapEntry ARGS2(
 	!strncasecomp(rawentry, "text/plain", 10)) {
 	--s;
 	*s = ';';
-	CTRACE(tfp, "ProcessMailcapEntry: Ignoring mailcap entry: %s\n",
-		    rawentry);
+	CTRACE((tfp, "ProcessMailcapEntry: Ignoring mailcap entry: %s\n",
+		    rawentry));
 	FREE(rawentry);
 	return(0);
     }
@@ -364,8 +364,8 @@ PRIVATE int ProcessMailcapEntry ARGS2(
 	    } else if (eq && !strcmp(arg, "test")) {
 		mc->testcommand = NULL;
 		StrAllocCopy(mc->testcommand, eq);
-		CTRACE(tfp, "ProcessMailcapEntry: Found testcommand:%s\n",
-			    mc->testcommand);
+		CTRACE((tfp, "ProcessMailcapEntry: Found testcommand:%s\n",
+			    mc->testcommand));
 	    } else if (eq && !strcmp(arg, "description")) {
 		mc->label = eq;
 	    } else if (eq && !strcmp(arg, "label")) {
@@ -385,8 +385,8 @@ PRIVATE int ProcessMailcapEntry ARGS2(
 		    mc->maxbytes = 0;
 	    } else if (strcmp(arg, "notes")) { /* IGNORE notes field */
 		if (*arg)
-		    CTRACE(tfp, "ProcessMailcapEntry: Ignoring mailcap flag '%s'.\n",
-			        arg);
+		    CTRACE((tfp, "ProcessMailcapEntry: Ignoring mailcap flag '%s'.\n",
+			        arg));
 	    }
 
 	}
@@ -398,8 +398,8 @@ assign_presentation:
     FREE(rawentry);
 
     if (PassesTest(mc)) {
-	CTRACE(tfp, "ProcessMailcapEntry Setting up conversion %s : %s\n",
-		    mc->contenttype, mc->command);
+	CTRACE((tfp, "ProcessMailcapEntry Setting up conversion %s : %s\n",
+		    mc->contenttype, mc->command));
 	HTSetPresentation(mc->contenttype, mc->command,
 			  mc->quality, 3.0, 0.0, mc->maxbytes);
     }
@@ -428,15 +428,15 @@ PRIVATE void BuildCommand ARGS5(
 		    break;
 		case 'n':
 		case 'F':
-		    CTRACE(tfp, "BuildCommand: Bad mailcap \"test\" clause: %s\n",
-				controlstring);
+		    CTRACE((tfp, "BuildCommand: Bad mailcap \"test\" clause: %s\n",
+				controlstring));
 		case 's':
 		    if (TmpFileLen && TmpFileName) {
 			if ((to - *pBuf) + TmpFileLen + 1 > Bufsize) {
 			    *to = '\0';
-			    CTRACE(tfp, "BuildCommand: Too long mailcap \"test\" clause,\n");
-			    CTRACE(tfp, "              ignoring: %s%s...\n",
-					*pBuf, TmpFileName);
+			    CTRACE((tfp, "BuildCommand: Too long mailcap \"test\" clause,\n"));
+			    CTRACE((tfp, "              ignoring: %s%s...\n",
+					*pBuf, TmpFileName));
 			    **pBuf = '\0';
 			    return;
 			}
@@ -445,9 +445,9 @@ PRIVATE void BuildCommand ARGS5(
 		    }
 		    break;
 		default:
-		    CTRACE(tfp,
+		    CTRACE((tfp,
   "BuildCommand: Ignoring unrecognized format code in mailcap file '%%%c'.\n",
-			*from);
+			*from));
 		    break;
 	    }
 	} else if (*from == '%') {
@@ -457,9 +457,9 @@ PRIVATE void BuildCommand ARGS5(
 	}
 	if (to >= *pBuf + Bufsize) {
 	    (*pBuf)[Bufsize - 1] = '\0';
-	    CTRACE(tfp, "BuildCommand: Too long mailcap \"test\" clause,\n");
-	    CTRACE(tfp, "              ignoring: %s...\n",
-			*pBuf);
+	    CTRACE((tfp, "BuildCommand: Too long mailcap \"test\" clause,\n"));
+	    CTRACE((tfp, "              ignoring: %s...\n",
+			*pBuf));
 	    **pBuf = '\0';
 	    return;
 	}
@@ -534,23 +534,23 @@ PRIVATE int PassesTest ARGS1(
 	0 == strcmp(mc->testcommand, "test \"$DISPLAY\" != \"\"") ||
 	0 == strcasecomp(mc->testcommand, "test -n \"$DISPLAY\"")) {
 	FREE(mc->testcommand);
-	CTRACE(tfp, "PassesTest: Testing for XWINDOWS environment.\n");
+	CTRACE((tfp, "PassesTest: Testing for XWINDOWS environment.\n"));
     	if (LYgetXDisplay() != NULL) {
-	    CTRACE(tfp, "PassesTest: Test passed!\n");
+	    CTRACE((tfp, "PassesTest: Test passed!\n"));
 	    return(0 == 0);
 	} else {
-	    CTRACE(tfp, "PassesTest: Test failed!\n");
+	    CTRACE((tfp, "PassesTest: Test failed!\n"));
 	    return(-1 == 0);
 	}
     }
     if (0 == strcasecomp(mc->testcommand, "test -z \"$DISPLAY\"")) {
 	FREE(mc->testcommand);
-	CTRACE(tfp, "PassesTest: Testing for NON_XWINDOWS environment.\n");
+	CTRACE((tfp, "PassesTest: Testing for NON_XWINDOWS environment.\n"));
     	if (LYgetXDisplay() == NULL) {
-	    CTRACE(tfp,"PassesTest: Test passed!\n");
+	    CTRACE((tfp,"PassesTest: Test passed!\n"));
 	    return(0 == 0);
 	} else {
-	    CTRACE(tfp,"PassesTest: Test failed!\n");
+	    CTRACE((tfp,"PassesTest: Test failed!\n"));
 	    return(-1 == 0);
 	}
     }
@@ -560,8 +560,8 @@ PRIVATE int PassesTest ARGS1(
      */
     if (0 == strcasecomp(mc->testcommand, "test -n \"$LYNX_VERSION\"")){
 	FREE(mc->testcommand);
-	CTRACE(tfp, "PassesTest: Testing for LYNX environment.\n");
-	CTRACE(tfp, "PassesTest: Test passed!\n");
+	CTRACE((tfp, "PassesTest: Testing for LYNX environment.\n"));
+	CTRACE((tfp, "PassesTest: Test passed!\n"));
 	return(0 == 0);
     } else
     /*
@@ -569,8 +569,8 @@ PRIVATE int PassesTest ARGS1(
      */
     if (0 == strcasecomp(mc->testcommand, "test -z \"$LYNX_VERSION\"")) {
 	FREE(mc->testcommand);
-	CTRACE(tfp, "PassesTest: Testing for non-LYNX environment.\n");
-	CTRACE(tfp, "PassesTest: Test failed!\n");
+	CTRACE((tfp, "PassesTest: Testing for non-LYNX environment.\n"));
+	CTRACE((tfp, "PassesTest: Test failed!\n"));
 	return(-1 == 0);
     }
 
@@ -594,7 +594,7 @@ PRIVATE int PassesTest ARGS1(
 		     mc->testcommand,
 		     TmpFileName,
 		     strlen(TmpFileName));
-	CTRACE(tfp, "PassesTest: Executing test command: %s\n", cmd);
+	CTRACE((tfp, "PassesTest: Executing test command: %s\n", cmd));
 	result = LYSystem(cmd);
 	FREE(cmd);
 	LYRemoveTemp(TmpFileName);
@@ -608,9 +608,9 @@ PRIVATE int PassesTest ARGS1(
     FREE(mc->testcommand);
 
     if (result) {
-	CTRACE(tfp,"PassesTest: Test failed!\n");
+	CTRACE((tfp,"PassesTest: Test failed!\n"));
     } else {
-	CTRACE(tfp,"PassesTest: Test passed!\n");
+	CTRACE((tfp,"PassesTest: Test passed!\n"));
     }
 
     return(result == 0);
@@ -622,11 +622,11 @@ PRIVATE int ProcessMailcapFile ARGS1(
     struct MailcapEntry mc;
     FILE *fp;
 
-    CTRACE(tfp, "ProcessMailcapFile: Loading file '%s'.\n",
-		file);
+    CTRACE((tfp, "ProcessMailcapFile: Loading file '%s'.\n",
+		file));
     if ((fp = fopen(file, TXT_R)) == NULL) {
-	CTRACE(tfp, "ProcessMailcapFile: Could not open '%s'.\n",
-		    file);
+	CTRACE((tfp, "ProcessMailcapFile: Could not open '%s'.\n",
+		    file));
 	return(-1 == 0);
     }
 
@@ -642,7 +642,7 @@ PRIVATE int ExitWithError ARGS1(
 	char *,		txt)
 {
     if (txt)
-	fprintf(tfp, "metamail: %s\n", txt);
+	fprintf(tfp, "Lynx: %s\n", txt);
     exit_immediately(-1);
     return(-1);
 }
@@ -698,7 +698,7 @@ PUBLIC void HTFileInit NOARGS
 {
     FILE *fp;
 
-    CTRACE(tfp, "HTFileInit: Loading default (HTInit) extension maps.\n");
+    CTRACE((tfp, "HTFileInit: Loading default (HTInit) extension maps.\n"));
 
     /* default suffix interpretation */
     HTSetSuffix("*",		"text/plain", "7bit", 1.0);
@@ -997,10 +997,10 @@ PRIVATE int HTLoadExtensionsConfigFile ARGS1(
     FILE *f;
     int count = 0;
 
-    CTRACE(tfp, "HTLoadExtensionsConfigFile: Loading file '%s'.\n", fn);
+    CTRACE((tfp, "HTLoadExtensionsConfigFile: Loading file '%s'.\n", fn));
 
     if ((f = fopen(fn, TXT_R)) == NULL) {
-	CTRACE(tfp, "HTLoadExtensionsConfigFile: Could not open '%s'.\n", fn);
+	CTRACE((tfp, "HTLoadExtensionsConfigFile: Could not open '%s'.\n", fn));
 	return count;
     }
 
@@ -1024,7 +1024,7 @@ PRIVATE int HTLoadExtensionsConfigFile ARGS1(
 		sprintf(ext, ".%s", word);
 		LYLowerCase(ext);
 
-		CTRACE (tfp, "SETTING SUFFIX '%s' to '%s'.\n", ext, ct);
+		CTRACE((tfp, "SETTING SUFFIX '%s' to '%s'.\n", ext, ct));
 
 	        if (strstr(ct, "tex") != NULL ||
 	            strstr(ct, "postscript") != NULL ||
diff --git a/src/HTML.c b/src/HTML.c
index 7c19502d..01a6aabb 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -726,7 +726,7 @@ PRIVATE void HTMLSRC_apply_markup ARGS4(
 	    force_classname = TRUE;
 	}
 #endif
-	CTRACE(tfp,ts->start ? "SRCSTART %d\n" : "SRCSTOP %d\n",(int)lexem);
+	CTRACE((tfp,ts->start ? "SRCSTART %d\n" : "SRCSTOP %d\n",(int)lexem));
 	if (ts->start)
 	    HTML_start_element(
 		context,
@@ -903,9 +903,9 @@ PRIVATE void HTML_start_element ARGS6(
 	int j = ((tag_charset < 0) ? me->UCLYhndl : tag_charset);
 
 	if ((me->tag_charset != j) || (j < 0  /* for trace entry */)) {
-	    CTRACE(tfp, "me->tag_charset: %d -> %d", me->tag_charset, j );
-	    CTRACE(tfp, " (me->UCLYhndl: %d, tag_charset: %d)\n",
-		   me->UCLYhndl, tag_charset);
+	    CTRACE((tfp, "me->tag_charset: %d -> %d", me->tag_charset, j ));
+	    CTRACE((tfp, " (me->UCLYhndl: %d, tag_charset: %d)\n",
+		   me->UCLYhndl, tag_charset));
 	    me->tag_charset = j;
 	}
     }
@@ -996,7 +996,7 @@ PRIVATE void HTML_start_element ARGS6(
 	/* seems that this condition is always true - HV */
 	if (displayStyles[element_number + STARTAT].color > -2) /* actually set */
 	{
-	    CTRACE(tfp, "CSSTRIM: start_element: top <%s>\n", HTML_dtd.tags[element_number].name);
+	    CTRACE((tfp, "CSSTRIM: start_element: top <%s>\n", HTML_dtd.tags[element_number].name));
 	    HText_characterStyle(me->text, hcode, 1);
 	}
     } else { /* (current_tag_style!=-1)	 */
@@ -1052,8 +1052,8 @@ PRIVATE void HTML_start_element ARGS6(
 
 	    StrAllocCopy(base, value[HTML_BASE_HREF]);
 	    if (!(url_type = LYLegitimizeHREF(me, &base, TRUE, TRUE))) {
-		CTRACE(tfp, "HTML: BASE '%s' is not an absolute URL.\n",
-			    (base ? base : ""));
+		CTRACE((tfp, "HTML: BASE '%s' is not an absolute URL.\n",
+			    (base ? base : "")));
 		if (me->inBadBASE == FALSE)
 		    HTAlert(BASE_NOT_ABSOLUTE);
 		me->inBadBASE = TRUE;
@@ -1218,7 +1218,7 @@ PRIVATE void HTML_start_element ARGS6(
 					 me->node_anchor->address));
 		    }
 		    HTAnchor_setOwner(me->node_anchor, href);
-		    CTRACE(tfp, "HTML: DOC OWNER '%s' found\n", href);
+		    CTRACE((tfp, "HTML: DOC OWNER '%s' found\n", href));
 		    FREE(href);
 
 		    /*
@@ -1256,7 +1256,7 @@ PRIVATE void HTML_start_element ARGS6(
 #ifndef USE_COLOR_STYLE
 		if (!strcasecomp(value[HTML_LINK_REL], "StyleSheet") ||
 		    !strcasecomp(value[HTML_LINK_REL], "Style")) {
-		    CTRACE(tfp, "HTML: StyleSheet link found.\n");
+		    CTRACE((tfp, "HTML: StyleSheet link found.\n"));
 #ifdef LINKEDSTYLES
 		    if (href && *href != '\0')
 		    {
@@ -1276,17 +1276,17 @@ PRIVATE void HTML_start_element ARGS6(
 				res = style_readFromFile(href);
 			    }
 			}
-			CTRACE(tfp, "CSS: StyleSheet=%s %d\n", href, res);
+			CTRACE((tfp, "CSS: StyleSheet=%s %d\n", href, res));
 			if (res == 0)
 			    HTAnchor_setStyle (me->node_anchor, href);
 		    }
 		    else {
-			CTRACE(tfp,
-				"        non-local StyleSheets not yet implemented.\n");
+			CTRACE((tfp,
+				"        non-local StyleSheets not yet implemented.\n"));
 		    }
 #else
-		    CTRACE(tfp,
-				"        StyleSheets not yet implemented.\n");
+		    CTRACE((tfp,
+				"        StyleSheets not yet implemented.\n"));
 #endif
 		    FREE(href);
 		    break;
@@ -1360,8 +1360,8 @@ PRIVATE void HTML_start_element ARGS6(
 			StrAllocCat(temp, value[HTML_LINK_REL]);
 		    }
 		} else {
-		    CTRACE(tfp, "HTML: LINK with REL=\"%s\" ignored.\n",
-				 value[HTML_LINK_REL]);
+		    CTRACE((tfp, "HTML: LINK with REL=\"%s\" ignored.\n",
+				 value[HTML_LINK_REL]));
 		    FREE(href);
 		    break;
 		}
@@ -1379,8 +1379,8 @@ PRIVATE void HTML_start_element ARGS6(
 	    } else if (!strcasecomp(value[HTML_LINK_REL], "Index")) {
 		StrAllocCopy(href, indexfile);
 	    } else {
-		CTRACE(tfp, "HTML: LINK with REL=\"%s\" and no HREF ignored.\n",
-			    value[HTML_LINK_REL]);
+		CTRACE((tfp, "HTML: LINK with REL=\"%s\" and no HREF ignored.\n",
+			    value[HTML_LINK_REL]));
 		break;
 	    }
 	    StrAllocCopy(title, value[HTML_LINK_REL]);
@@ -1471,7 +1471,7 @@ PRIVATE void HTML_start_element ARGS6(
 	    {
 		char *tmp = 0;
 		HTSprintf0(&tmp, "link.%s.%s", value[HTML_LINK_CLASS], title);
-		CTRACE(tfp, "CSSTRIM:link=%s\n", tmp);
+		CTRACE((tfp, "CSSTRIM:link=%s\n", tmp));
 
 		HText_characterStyle(me->text, hash_code(tmp), 1);
 		HTML_put_string(me, title);
@@ -1766,9 +1766,9 @@ PRIVATE void HTML_start_element ARGS6(
 	if (me->Division_Level < (MAX_NESTING - 1)) {
 	    me->Division_Level++;
 	} else {
-	    CTRACE(tfp,
+	    CTRACE((tfp,
 		"HTML: ****** Maximum nesting of %d divisions exceeded!\n",
-		MAX_NESTING);
+		MAX_NESTING));
 	}
 	if (me->inP)
 	    LYEnsureSingleSpace(me); /* always at least break line - kw */
@@ -2059,7 +2059,7 @@ PRIVATE void HTML_start_element ARGS6(
 
     case HTML_TAB:
 	if (!present) { /* Bad tag.  Must have at least one attribute. - FM */
-	    CTRACE(tfp, "HTML: TAB tag has no attributes.  Ignored.\n");
+	    CTRACE((tfp, "HTML: TAB tag has no attributes.  Ignored.\n"));
 	    break;
 	}
 	UPDATE_STYLE;
@@ -2073,7 +2073,7 @@ PRIVATE void HTML_start_element ARGS6(
 	     *	the ALIGN and DP attributes implemented. - FM
 	     */
 	    HTML_put_character(me, ' ');
-	    CTRACE(tfp, "HTML: ALIGN not 'left'.  Using space instead of TAB.\n");
+	    CTRACE((tfp, "HTML: ALIGN not 'left'.  Using space instead of TAB.\n"));
 
 	} else if (!LYoverride_default_alignment(me) &&
 		   me->current_default_alignment != HT_LEFT) {
@@ -2084,7 +2084,7 @@ PRIVATE void HTML_start_element ARGS6(
 	     *	that the alignment be HT_LEFT. - FM
 	     */
 	    HTML_put_character(me, ' ');
-	    CTRACE(tfp, "HTML: Not HT_LEFT.  Using space instead of TAB.\n");
+	    CTRACE((tfp, "HTML: Not HT_LEFT.  Using space instead of TAB.\n"));
 
 	} else if ((present[HTML_TAB_TO] &&
 		    value[HTML_TAB_TO] && *value[HTML_TAB_TO]) ||
@@ -2124,7 +2124,7 @@ PRIVATE void HTML_start_element ARGS6(
 	    if (target < column ||
 		target > HText_getMaximumColumn(me->text)) {
 		HTML_put_character(me, ' ');
-		CTRACE(tfp, "HTML: Column out of bounds.  Using space instead of TAB.\n");
+		CTRACE((tfp, "HTML: Column out of bounds.  Using space instead of TAB.\n"));
 	    } else {
 		for (i = column; i < target; i++)
 		    HText_appendCharacter(me->text, ' ');
@@ -2193,15 +2193,15 @@ PRIVATE void HTML_start_element ARGS6(
 	 *  Can't display both underline and bold at same time.
 	 */
 	if (me->inBoldA == TRUE || me->inBoldH == TRUE) {
-	    CTRACE(tfp, "Underline Level is %d\n", me->Underline_Level);
+	    CTRACE((tfp, "Underline Level is %d\n", me->Underline_Level));
 	    break;
 	}
 	if (me->inUnderline == FALSE) {
 	    HText_appendCharacter(me->text, LY_UNDERLINE_START_CHAR);
 	    me->inUnderline = TRUE;
-	    CTRACE(tfp,"Beginning underline\n");
+	    CTRACE((tfp,"Beginning underline\n"));
 	} else {
-	    CTRACE(tfp,"Underline Level is %d\n", me->Underline_Level);
+	    CTRACE((tfp,"Underline Level is %d\n", me->Underline_Level));
 	}
 	break;
 
@@ -2903,8 +2903,8 @@ PRIVATE void HTML_start_element ARGS6(
 		** Found TYPE="internal link" but not in a valid context
 		** where we have written it. - kw
 		*/
-		CTRACE(tfp, "HTML: Found invalid HREF=\"%s\" TYPE=\"%s\"!\n",
-			    href, temp);
+		CTRACE((tfp, "HTML: Found invalid HREF=\"%s\" TYPE=\"%s\"!\n",
+			    href, temp));
 		FREE(temp);
 	    }
 	}
@@ -3010,13 +3010,13 @@ PRIVATE void HTML_start_element ARGS6(
 				      )) != NULL) {
 		if (dest->isISMAPScript == TRUE) {
 		    dest_ismap = TRUE;
-		    CTRACE(tfp, "HTML: '%s' is an ISMAP script\n",
-				dest->address);
+		    CTRACE((tfp, "HTML: '%s' is an ISMAP script\n",
+				dest->address));
 		} else if (present && present[HTML_IMG_ISMAP]) {
 		    dest_ismap = TRUE;
 		    dest->isISMAPScript = TRUE;
-		    CTRACE(tfp, "HTML: Designating '%s' as an ISMAP script\n",
-				dest->address);
+		    CTRACE((tfp, "HTML: Designating '%s' as an ISMAP script\n",
+				dest->address));
 		}
 	    }
 	}
@@ -3204,10 +3204,10 @@ PRIVATE void HTML_start_element ARGS6(
 	    FREE(temp);
 	}
 
-	CTRACE(tfp, "HTML IMG: USEMAP=%d ISMAP=%d ANCHOR=%d PARA=%d\n",
+	CTRACE((tfp, "HTML IMG: USEMAP=%d ISMAP=%d ANCHOR=%d PARA=%d\n",
 		    map_href ? 1 : 0,
 		    (dest_ismap == TRUE) ? 1 : 0,
-		    me->inA, me->inP);
+		    me->inA, me->inP));
 
 	/*
 	 *  Check for an ID attribute. - FM
@@ -4324,7 +4324,7 @@ PRIVATE void HTML_start_element ARGS6(
 	     *	that one now. - FM
 	     */
 	    if (me->inFORM) {
-		CTRACE(tfp, "HTML: Missing FORM end tag.  Faking it!\n");
+		CTRACE((tfp, "HTML: Missing FORM end tag.  Faking it!\n"));
 		SET_SKIP_STACK(HTML_FORM);
 		HTML_end_element(me, HTML_FORM, include);
 	    }
@@ -4709,7 +4709,7 @@ PRIVATE void HTML_start_element ARGS6(
 		    if (me->inFORM)
 			HText_DisableCurrentForm();
 #endif /* NOTDEFINED */
-		    CTRACE(tfp, "HTML: Ignoring TYPE=\"range\"\n");
+		    CTRACE((tfp, "HTML: Ignoring TYPE=\"range\"\n"));
 		    break;
 
 		} else if (!strcasecomp(I.type, "file")) {
@@ -4729,13 +4729,13 @@ PRIVATE void HTML_start_element ARGS6(
 					      LY_UNDERLINE_END_CHAR);
 		    }
 #else
-		    CTRACE(tfp, "Attempting to fake as: %s\n", I.type);
+		    CTRACE((tfp, "Attempting to fake as: %s\n", I.type));
 #endif /* EXP_FILE_UPLOAD */
 #ifdef NOTDEFINED
 		    if (me->inFORM)
 			HText_DisableCurrentForm();
 #endif /* NOTDEFINED */
-		    CTRACE(tfp, "HTML: Ignoring TYPE=\"file\"\n");
+		    CTRACE((tfp, "HTML: Ignoring TYPE=\"file\"\n"));
 
 		} else if (!strcasecomp(I.type, "button")) {
 		    /*
@@ -4765,7 +4765,7 @@ PRIVATE void HTML_start_element ARGS6(
 		 */
 	    }
 
-	    CTRACE(tfp, "Ok, we're trying [%s]\n", I.type);
+	    CTRACE((tfp, "Ok, we're trying [%s]\n", I.type));
 
 	    /*
 	     *	Check for an unclosed TEXTAREA.
@@ -4784,7 +4784,7 @@ PRIVATE void HTML_start_element ARGS6(
 	     *	Check for an unclosed SELECT, try to close it if found.
 	     */
 	    if (me->inSELECT) {
-		CTRACE(tfp, "HTML: Missing SELECT end tag, faking it...\n");
+		CTRACE((tfp, "HTML: Missing SELECT end tag, faking it...\n"));
 		if (me->sp->tag_number != HTML_SELECT) {
 		    SET_SKIP_STACK(HTML_SELECT);
 		}
@@ -4879,7 +4879,7 @@ PRIVATE void HTML_start_element ARGS6(
 		}
 		FREE(href);
 	    }
-	    CTRACE(tfp, "2.Ok, we're trying [%s] (present=%p)\n", I.type, present);
+	    CTRACE((tfp, "2.Ok, we're trying [%s] (present=%p)\n", I.type, present));
 	    /* text+file don't go in here */
 	    if ((UseALTasVALUE == TRUE) ||
 		(present && present[HTML_INPUT_VALUE] &&
@@ -4900,7 +4900,7 @@ PRIVATE void HTML_start_element ARGS6(
 		    HTMLSetCharacterHandling(current_char_set);
 		}
 
-		CTRACE(tfp, "3.Ok, we're trying [%s]\n", I.type);
+		CTRACE((tfp, "3.Ok, we're trying [%s]\n", I.type));
 		if (!I.type)
 		    me->UsePlainSpace = TRUE;
 		else if (!strcasecomp(I.type, "text") ||
@@ -4910,7 +4910,7 @@ PRIVATE void HTML_start_element ARGS6(
 			 !strcasecomp(I.type, "submit") ||
 			 !strcasecomp(I.type, "image") ||
 			 !strcasecomp(I.type, "reset")) {
-		    CTRACE(tfp, "normal field type: %s\n", I.type);
+		    CTRACE((tfp, "normal field type: %s\n", I.type));
 		    me->UsePlainSpace = TRUE;
 		}
 
@@ -4921,7 +4921,7 @@ PRIVATE void HTML_start_element ARGS6(
 		if (me->UsePlainSpace && !me->HiddenValue) {
 		    I.value_cs = current_char_set;
 		}
-	    CTRACE(tfp, "4.Ok, we're trying [%s]\n", I.type);
+		CTRACE((tfp, "4.Ok, we're trying [%s]\n", I.type));
 		TRANSLATE_AND_UNESCAPE_ENTITIES6(
 		    &I_value,
 		    ATTR_CS_IN,
@@ -5012,7 +5012,7 @@ PRIVATE void HTML_start_element ARGS6(
 
 	    chars = HText_beginInput(me->text, me->inUnderline, &I);
 #ifndef EXP_FILE_UPLOAD
-	    CTRACE(tfp, "I.%s have %d chars, or something\n", I.type, chars);
+	    CTRACE((tfp, "I.%s have %d chars, or something\n", I.type, chars));
 #endif
 	    /*
 	     *	Submit and reset buttons have values which don't change,
@@ -5087,7 +5087,7 @@ PRIVATE void HTML_start_element ARGS6(
 		HText_setIgnoreExcess(me->text, TRUE);
 	    }
 #ifndef EXP_FILE_UPLOAD
-	    CTRACE(tfp, "I.%s, %d\n", I.type, IsSubmitOrReset);
+	    CTRACE((tfp, "I.%s, %d\n", I.type, IsSubmitOrReset));
 #endif
 	    if (IsSubmitOrReset == FALSE) {
 		/*
@@ -5499,9 +5499,9 @@ PRIVATE void HTML_start_element ARGS6(
 	if (me->Division_Level < (MAX_NESTING - 1)) {
 	    me->Division_Level++;
 	} else {
-	    CTRACE(tfp,
+	    CTRACE((tfp,
 	    "HTML: ****** Maximum nesting of %d divisions/tables exceeded!\n",
-		    MAX_NESTING);
+		    MAX_NESTING));
 	}
 	if (present && present[HTML_TABLE_ALIGN] &&
 	    value[HTML_TABLE_ALIGN] && *value[HTML_TABLE_ALIGN]) {
@@ -5695,9 +5695,9 @@ PRIVATE void HTML_start_element ARGS6(
 
     if (HTML_dtd.tags[ElementNumber].contents != SGML_EMPTY) {
 	if (me->skip_stack > 0) {
-	    CTRACE(tfp,
+	    CTRACE((tfp,
     "HTML:begin_element: internal call (level %d), leaving on stack - `%s'\n",
-			me->skip_stack, me->sp->style->name);
+			me->skip_stack, me->sp->style->name));
 	    me->skip_stack--;
 	    return;
 	}
@@ -5716,9 +5716,9 @@ PRIVATE void HTML_start_element ARGS6(
 	    return;
 	}
 
-	CTRACE(tfp,"HTML:begin_element[%d]: adding style to stack - %s\n",
+	CTRACE((tfp,"HTML:begin_element[%d]: adding style to stack - %s\n",
 							(int) STACKLEVEL(me),
-							me->new_style->name);
+							me->new_style->name));
 	(me->sp)--;
 	me->sp[0].style = me->new_style;	/* Stack new style */
 	me->sp[0].tag_number = ElementNumber;
@@ -5743,7 +5743,7 @@ PRIVATE void HTML_start_element ARGS6(
 
     if (REALLY_EMPTY(element_number))
     {
-	CTRACE(tfp, "STYLE:begin_element:ending EMPTY element style\n");
+	CTRACE((tfp, "STYLE:begin_element:ending EMPTY element style\n"));
 #if !defined(USE_HASH)
 	HText_characterStyle(me->text, element_number+STARTAT, STACK_OFF);
 #else
@@ -5818,10 +5818,10 @@ PRIVATE void HTML_end_element ARGS3(
 #ifdef CAREFUL			/* parser assumed to produce good nesting */
     if (element_number != me->sp[0].tag_number &&
 	HTML_dtd.tags[element_number].contents != SGML_EMPTY) {
-	CTRACE(tfp,
+	CTRACE((tfp,
 		"HTMLText: end of element %s when expecting end of %s\n",
 		HTML_dtd.tags[element_number].name,
-		HTML_dtd.tags[me->sp->tag_number].name);
+		HTML_dtd.tags[me->sp->tag_number].name));
 		/* panic */
     }
 #endif /* CAREFUL */
@@ -5863,8 +5863,8 @@ PRIVATE void HTML_end_element ARGS3(
 	    BreakFlag = TRUE;
 	}
 	if (me->skip_stack > 0) {
-	     CTRACE(tfp, "HTML:end_element: Internal call (level %d), leaving on stack - %s\n",
-			me->skip_stack, me->sp->style->name);
+	     CTRACE((tfp, "HTML:end_element: Internal call (level %d), leaving on stack - %s\n",
+			me->skip_stack, me->sp->style->name));
 	    me->skip_stack--;
 	} else if (me->stack_overrun == TRUE &&
 	    element_number != me->sp[0].tag_number) {
@@ -5914,12 +5914,12 @@ PRIVATE void HTML_end_element ARGS3(
 		reached_awaited_stacked_elt = TRUE;
 #endif
 	    (me->sp)++;
-	    CTRACE(tfp, "HTML:end_element[%d]: Popped style off stack - %s\n",
+	    CTRACE((tfp, "HTML:end_element[%d]: Popped style off stack - %s\n",
 			(int) STACKLEVEL(me),
-			me->sp->style->name);
+			me->sp->style->name));
 	} else {
-	    CTRACE(tfp,
-  "Stack underflow error!  Tried to pop off more styles than exist in stack\n");
+	    CTRACE((tfp,
+  "Stack underflow error!  Tried to pop off more styles than exist in stack\n"));
 	}
     }
     if (BreakFlag == TRUE) {
@@ -6040,8 +6040,8 @@ PRIVATE void HTML_end_element ARGS3(
 	 *  we'll just ignore. - FM
 	 */
 	HTChunkTerminate(&me->style_block);
-	CTRACE(tfp, "HTML: STYLE content =\n%s\n",
-			    me->style_block.data);
+	CTRACE((tfp, "HTML: STYLE content =\n%s\n",
+			    me->style_block.data));
 	HTChunkClear(&me->style_block);
 	break;
 
@@ -6051,8 +6051,8 @@ PRIVATE void HTML_end_element ARGS3(
 	 *  we'll just ignore. - FM
 	 */
 	HTChunkTerminate(&me->script);
-	CTRACE(tfp, "HTML: SCRIPT content =\n%s\n",
-			    me->script.data);
+	CTRACE((tfp, "HTML: SCRIPT content =\n%s\n",
+			    me->script.data));
 	HTChunkClear(&me->script);
 	break;
 
@@ -6192,9 +6192,9 @@ PRIVATE void HTML_end_element ARGS3(
 	if (me->inUnderline && me->Underline_Level < 1) {
 	    HText_appendCharacter(me->text, LY_UNDERLINE_END_CHAR);
 	    me->inUnderline = FALSE;
-	    CTRACE(tfp, "Ending underline\n");
+	    CTRACE((tfp, "Ending underline\n"));
 	} else {
-	    CTRACE(tfp, "Underline Level is %d\n", me->Underline_Level);
+	    CTRACE((tfp, "Underline Level is %d\n", me->Underline_Level));
 	}
 	break;
 
@@ -6290,8 +6290,8 @@ PRIVATE void HTML_end_element ARGS3(
     case HTML_MENU:
     case HTML_DIR:
 	me->List_Nesting_Level--;
-	CTRACE(tfp, "HTML_end_element: Reducing List Nesting Level to %d\n",
-		    me->List_Nesting_Level);
+	CTRACE((tfp, "HTML_end_element: Reducing List Nesting Level to %d\n",
+		    me->List_Nesting_Level));
 #ifdef EXP_JUSTIFY_ELTS
 	if (element_number == HTML_DL)
 	    in_DT = FALSE; /*close the term that was without definition. */
@@ -6419,7 +6419,7 @@ PRIVATE void HTML_end_element ARGS3(
 		 *  pass a dummy start tag to the SGML parser so that it
 		 *  will resume the accumulation of OBJECT content. - FM
 		 */
-		CTRACE(tfp, "HTML: Nested OBJECT tags.  Recycling.\n");
+		CTRACE((tfp, "HTML: Nested OBJECT tags.  Recycling.\n"));
 		if (*include == NULL) {
 		    StrAllocCopy(*include, "<OBJECT>");
 		} else {
@@ -6453,7 +6453,7 @@ PRIVATE void HTML_end_element ARGS3(
 	     *	assuming we weren't tripped up by comments
 	     *	or quoted attributes. - FM
 	     */
-	    CTRACE(tfp, "HTML:OBJECT content:\n%s\n", me->object.data);
+	    CTRACE((tfp, "HTML:OBJECT content:\n%s\n", me->object.data));
 
 	    /*
 	     *	OBJECTs with DECLARE should be saved but
@@ -6466,7 +6466,7 @@ PRIVATE void HTML_end_element ARGS3(
 	    if (me->object_declare == TRUE) {
 		if (me->object_id && *me->object_id)
 		    LYHandleID(me, me->object_id);
-		CTRACE(tfp, "HTML: DECLAREd OBJECT.  Ignoring!\n");
+		CTRACE((tfp, "HTML: DECLAREd OBJECT.  Ignoring!\n"));
 		goto End_Object;
 	    }
 
@@ -6479,7 +6479,7 @@ PRIVATE void HTML_end_element ARGS3(
 	    if (me->object_name != NULL) {
 		if (me->object_id && *me->object_id)
 		    LYHandleID(me, me->object_id);
-		CTRACE(tfp, "HTML: NAMEd OBJECT.  Ignoring!\n");
+		CTRACE((tfp, "HTML: NAMEd OBJECT.  Ignoring!\n"));
 		goto End_Object;
 	    }
 
@@ -6505,8 +6505,8 @@ PRIVATE void HTML_end_element ARGS3(
 		    }
 		    StrAllocCat(data, "</OBJECT>");
 		    StrAllocCat(*include, data);
-		    CTRACE(tfp, "HTML: Recycling nested OBJECT%s.\n",
-					(e > 1) ? "s" : "");
+		    CTRACE((tfp, "HTML: Recycling nested OBJECT%s.\n",
+					(e > 1) ? "s" : ""));
 		    FREE(data);
 		    goto End_Object;
 		} else {
@@ -6525,7 +6525,7 @@ PRIVATE void HTML_end_element ARGS3(
 	     *	If it's content has SHAPES, convert it to FIG. - FM
 	     */
 	    if (me->object_shapes == TRUE) {
-		CTRACE(tfp, "HTML: OBJECT has SHAPES.  Converting to FIG.\n");
+		CTRACE((tfp, "HTML: OBJECT has SHAPES.  Converting to FIG.\n"));
 		StrAllocCat(*include, "<FIG ISOBJECT IMAGEMAP");
 		if (me->object_ismap == TRUE)
 		    StrAllocCat(*include, " IMAGEMAP");
@@ -6553,7 +6553,7 @@ PRIVATE void HTML_end_element ARGS3(
 	     *	convert it to IMG. - FM
 	     */
 	    if (me->object_usemap != NULL) {
-		CTRACE(tfp, "HTML: OBJECT has USEMAP.  Converting to IMG.\n");
+		CTRACE((tfp, "HTML: OBJECT has USEMAP.  Converting to IMG.\n"));
 
 		StrAllocCat(*include, "<IMG ISOBJECT");
 		if (me->object_id != NULL) {
@@ -7176,7 +7176,7 @@ End_Object:
 
     if (!REALLY_EMPTY(element_number))
     {
-	CTRACE(tfp, "STYLE:end_element: ending non-EMPTY style\n");
+	CTRACE((tfp, "STYLE:end_element: ending non-EMPTY style\n"));
 #if !defined(USE_HASH)
 	HText_characterStyle(me->text, element_number+STARTAT, STACK_OFF);
 #else
@@ -7254,7 +7254,7 @@ PRIVATE void HTML_free ARGS1(HTStructured *, me)
 	    HText_appendCharacter(me->text, LY_UNDERLINE_END_CHAR);
 	    me->inUnderline = FALSE;
 	    me->Underline_Level = 0;
-	    CTRACE(tfp,"HTML_free: Ending underline\n");
+	    CTRACE((tfp,"HTML_free: Ending underline\n"));
 	}
 	if (me->inA) {
 	    HTML_end_element(me, HTML_A, (char **)&include);
@@ -7288,8 +7288,8 @@ PRIVATE void HTML_free ARGS1(HTStructured *, me)
 	     *	Output the left-over data as text, maybe it was invalid
 	     *	markup meant to be shown somewhere. - kw
 	     */
-	    CTRACE(tfp, "HTML_free: ***** leftover option data: %s\n",
-			me->option.data);
+	    CTRACE((tfp, "HTML_free: ***** leftover option data: %s\n",
+			me->option.data));
 	    HTML_put_string(me, me->option.data);
 	    HTChunkClear(&me->option);
 	}
@@ -7311,8 +7311,8 @@ PRIVATE void HTML_free ARGS1(HTStructured *, me)
 	     *	Output the left-over data as text, maybe it was invalid
 	     *	markup meant to be shown somewhere. - kw
 	     */
-	    CTRACE(tfp, "HTML_free: ***** leftover textarea data: %s\n",
-			me->textarea.data);
+	    CTRACE((tfp, "HTML_free: ***** leftover textarea data: %s\n",
+			me->textarea.data));
 	    HTML_put_string(me, me->textarea.data);
 	    HTChunkClear(&me->textarea);
 	}
@@ -7950,7 +7950,7 @@ PRIVATE HTStream* CacheThru_new ARGS2(
     /*  Only remote HTML documents may benefits from HTreparse_document(), */
     /*  oh, assume http protocol:                                          */
     if (strcmp(p->name, "http") != 0) {
-	CTRACE(tfp, "Protocol is \"%s\"; not caching\n", p->name);
+	CTRACE((tfp, "Protocol is \"%s\"; not caching\n", p->name));
 	return target;
     }
 #else
@@ -7969,8 +7969,8 @@ PRIVATE HTStream* CacheThru_new ARGS2(
 
     if (LYCacheSource == SOURCE_CACHE_FILE) {
 	if (anchor->source_cache_file) {
-	    CTRACE(tfp, "Reusing source cache file %s\n",
-		   anchor->source_cache_file);
+	    CTRACE((tfp, "Reusing source cache file %s\n",
+		   anchor->source_cache_file));
 	    FREE(stream);
 	    return target;
 	}
@@ -7982,30 +7982,30 @@ PRIVATE HTStream* CacheThru_new ARGS2(
 	 * contain exactly what came in from the network.
 	 */
 	if (!(stream->fp = LYOpenTemp(filename, HTML_SUFFIX, "wb"))) {
-	    CTRACE(tfp, "Cannot get source cache file for URL %s\n",
-		   HTAnchor_address((HTAnchor *)anchor));
+	    CTRACE((tfp, "Cannot get source cache file for URL %s\n",
+		   HTAnchor_address((HTAnchor *)anchor)));
 	    FREE(stream);
 	    return target;
 	}
 
 	StrAllocCopy(anchor->source_cache_file, filename);
 
-	CTRACE(tfp, "Caching source for URL %s in file %s\n",
-	       HTAnchor_address((HTAnchor *)anchor), filename);
+	CTRACE((tfp, "Caching source for URL %s in file %s\n",
+		     HTAnchor_address((HTAnchor *)anchor), filename));
     }
 
     if (LYCacheSource == SOURCE_CACHE_MEMORY) {
 	if (anchor->source_cache_chunk) {
-	    CTRACE(tfp, "Reusing source memory cache %p\n",
-		   (void *)anchor->source_cache_chunk);
+	    CTRACE((tfp, "Reusing source memory cache %p\n",
+		   (void *)anchor->source_cache_chunk));
 	    FREE(stream);
 	    return target;
 	}
 
 	/* I think this is right... */
 	anchor->source_cache_chunk = stream->chunk = HTChunkCreate(128);
-	CTRACE(tfp, "Caching source for URL %s in memory cache %p\n",
-	       HTAnchor_address((HTAnchor *)anchor), (void *)stream->chunk);
+	CTRACE((tfp, "Caching source for URL %s in memory cache %p\n",
+	       HTAnchor_address((HTAnchor *)anchor), (void *)stream->chunk));
 
     }
 
diff --git a/src/LYBookmark.c b/src/LYBookmark.c
index e07799eb..c43405b9 100644
--- a/src/LYBookmark.c
+++ b/src/LYBookmark.c
@@ -94,8 +94,8 @@ PUBLIC char * get_bookmark_filename ARGS1(
     LYAddPathToHome(filename_buffer,
 		    sizeof(filename_buffer),
 		    BookmarkPage);
-    CTRACE(tfp, "\nget_bookmark_filename: SEEKING %s\n   AS %s\n\n",
-		BookmarkPage, filename_buffer);
+    CTRACE((tfp, "\nget_bookmark_filename: SEEKING %s\n   AS %s\n\n",
+		BookmarkPage, filename_buffer));
     if ((fp = fopen(filename_buffer, TXT_R)) != NULL) {
 	goto success;
     }
@@ -350,8 +350,8 @@ PUBLIC void save_bookmark_link ARGS2(
 			sizeof(filename_buffer),
 			BookmarkPage);
     }
-    CTRACE(tfp, "\nsave_bookmark_link: SEEKING %s\n   AS %s\n\n",
-		BookmarkPage, filename_buffer);
+    CTRACE((tfp, "\nsave_bookmark_link: SEEKING %s\n   AS %s\n\n",
+		BookmarkPage, filename_buffer));
     if ((fp = fopen(filename_buffer, (first_time ? "w" : "a+"))) == NULL) {
 	LYMBM_statusline(BOOKMARK_OPEN_FAILED);
 	sleep(AlertSecs);
@@ -387,7 +387,7 @@ PUBLIC void save_bookmark_link ARGS2(
 	fprintf(fp,
 	    gettext("     You can delete links by the 'R' key<br>\n<ol>\n"));
 #else
-	fprintf(fp, "%s<br>\n%s\n\n<!--\n%s\n-->\n\n<p>\n<ol>",
+	fprintf(fp, "%s<br>\n%s\n\n<!--\n%s\n-->\n\n<p>\n<ol>\n",
 		    gettext("\
      You can delete links using the remove bookmark command.  It is usually\n\
      the 'R' key but may have been remapped by you or your system\n\
@@ -482,15 +482,15 @@ PUBLIC void remove_bookmark_link ARGS2(
 #endif /* VMS */
     char homepath[LY_MAXPATH];
 
-    CTRACE(tfp, "remove_bookmark_link: deleting link number: %d\n", cur);
+    CTRACE((tfp, "remove_bookmark_link: deleting link number: %d\n", cur));
 
     if (!cur_bookmark_page)
 	return;
     LYAddPathToHome(filename_buffer,
 		    sizeof(filename_buffer),
 		    cur_bookmark_page);
-    CTRACE(tfp, "\nremove_bookmark_link: SEEKING %s\n   AS %s\n\n",
-		cur_bookmark_page, filename_buffer);
+    CTRACE((tfp, "\nremove_bookmark_link: SEEKING %s\n   AS %s\n\n",
+		cur_bookmark_page, filename_buffer));
     if ((fp = fopen(filename_buffer, TXT_R)) == NULL) {
 	HTAlert(BOOKMARK_OPEN_FAILED_FOR_DEL);
 	return;
@@ -530,15 +530,19 @@ PUBLIC void remove_bookmark_link ARGS2(
 	}
 
     } else {
-	char *cp;
+	char *cp, *cp2;
 	BOOLEAN retain;
 	int seen;
 
 	n = -1;
 	while (LYSafeGets(&buf, fp) != NULL) {
+	    int keep_ol = FALSE;
 	    retain = TRUE;
 	    seen = 0;
 	    cp = buf;
+	    if ((cur == 0) && (cp2 = LYstrstr(cp,"<ol><LI>")))
+		keep_ol = TRUE; /* Do not erase, this corrects a bug in an
+				   older version */
 	    while (n < cur && (cp = LYstrstr(cp, "<a href="))) {
 		seen++;
 		if (++n == cur) {
@@ -547,7 +551,9 @@ PUBLIC void remove_bookmark_link ARGS2(
 			HTAlert(BOOKMARK_LINK_NOT_ONE_LINE);
 			goto failure;
 		    }
-		    CTRACE(tfp, "remove_bookmark_link: skipping link %d\n", n);
+		    CTRACE((tfp, "remove_bookmark_link: skipping link %d\n", n));
+		    if (keep_ol)
+			fprintf(nfp,"<ol>\n");
 		    retain = FALSE;
 		}
 		cp += 8;
@@ -557,8 +563,8 @@ PUBLIC void remove_bookmark_link ARGS2(
 	}
     }
 
-    CTRACE(tfp, "remove_bookmark_link: files: %s %s\n",
-			newfile, filename_buffer);
+    CTRACE((tfp, "remove_bookmark_link: files: %s %s\n",
+			newfile, filename_buffer));
 
     fclose(fp);
     fp = NULL;
diff --git a/src/LYCgi.c b/src/LYCgi.c
index 375206a6..eb1ceda3 100644
--- a/src/LYCgi.c
+++ b/src/LYCgi.c
@@ -68,7 +68,7 @@ PRIVATE char *post_len = NULL;
 
 PRIVATE void add_environment_value PARAMS((char *env_value));
 
-#define PERROR(msg) CTRACE(tfp, "LYNXCGI: %s: %s\n", msg, LYStrerror(errno))
+#define PERROR(msg) CTRACE((tfp, "LYNXCGI: %s: %s\n", msg, LYStrerror(errno)))
 
 #ifdef LY_FIND_LEAKS
 PRIVATE void free_alloced_lynxcgi NOARGS
@@ -222,8 +222,8 @@ PRIVATE int LYLoadCGI ARGS4(
 	    /* Found PATH_INFO data.  Strip it off of pgm and into path_info. */
 	    StrAllocCopy(path_info, pgm+strlen(pgm_buff));
 	    strcpy(pgm, pgm_buff);
-	    CTRACE(tfp, "LYNXCGI: stat() of %s succeeded, path_info=\"%s\".\n",
-			pgm_buff, path_info);
+	    CTRACE((tfp, "LYNXCGI: stat() of %s succeeded, path_info=\"%s\".\n",
+			pgm_buff, path_info));
 	}
 	FREE(pgm_buff);
     }
@@ -258,8 +258,8 @@ PRIVATE int LYLoadCGI ARGS4(
 	 *  to confusing to know just what file is loaded. - kw
 	 */
 	if (path_info) {
-	    CTRACE(tfp, "%s is not a file and %s not an executable, giving up.\n",
-			orig_pgm, pgm);
+	    CTRACE((tfp, "%s is not a file and %s not an executable, giving up.\n",
+			orig_pgm, pgm));
 	    FREE(path_info);
 	    FREE(pgm);
 	    FREE(orig_pgm);
@@ -269,7 +269,7 @@ PRIVATE int LYLoadCGI ARGS4(
 
 	LYLocalFileToURL (&new_arg, orig_pgm);
 
-	CTRACE(tfp, "%s is not an executable file, passing the buck.\n", arg);
+	CTRACE((tfp, "%s is not an executable file, passing the buck.\n", arg));
 	status = HTLoadFile(new_arg, anAnchor, format_out, sink);
 	FREE(new_arg);
 
@@ -399,10 +399,10 @@ PRIVATE int LYLoadCGI ARGS4(
 		    close(fd1[0]);
 
 		    /* We have form data to push across the pipe */
-		    CTRACE(tfp, "LYNXCGI: Doing post, content-type '%s'\n",
-				anAnchor->post_content_type);
-		    CTRACE(tfp, "LYNXCGI: Writing:\n%s----------------------------------\n",
-				anAnchor->post_data);
+		    CTRACE((tfp, "LYNXCGI: Doing post, content-type '%s'\n",
+				anAnchor->post_content_type));
+		    CTRACE((tfp, "LYNXCGI: Writing:\n%s----------------------------------\n",
+				anAnchor->post_data));
 		    remaining = strlen(anAnchor->post_data);
 		    while ((written = write(fd1[1],
 					    anAnchor->post_data + total_written,
@@ -419,16 +419,16 @@ PRIVATE int LYLoadCGI ARGS4(
 			    PERROR("write() of POST data failed");
 			    break;
 			}
-			CTRACE(tfp, "LYNXCGI: Wrote %d bytes of POST data.\n",
-				    written);
+			CTRACE((tfp, "LYNXCGI: Wrote %d bytes of POST data.\n",
+				    written));
 			total_written += written;
 			remaining -= written;
 			if (remaining == 0)
 			    break;
 		    }
 		    if (remaining != 0) {
-			CTRACE(tfp, "LYNXCGI: %d bytes remain unwritten!\n",
-				    remaining);
+			CTRACE((tfp, "LYNXCGI: %d bytes remain unwritten!\n",
+				    remaining));
 		    }
 		    close(fd1[1]);
 		}
@@ -448,7 +448,7 @@ PRIVATE int LYLoadCGI ARGS4(
 			break;
 		    }
 		    HTReadProgress(total_chars += chars, 0);
-		    CTRACE(tfp, "LYNXCGI: Rx: %.*s\n", chars, buf);
+		    CTRACE((tfp, "LYNXCGI: Rx: %.*s\n", chars, buf));
 		    (*target->isa->put_block)(target, buf, chars);
 		}
 
diff --git a/src/LYCharSets.c b/src/LYCharSets.c
index 64effdde..6e775c27 100644
--- a/src/LYCharSets.c
+++ b/src/LYCharSets.c
@@ -502,13 +502,13 @@ PUBLIC void HTMLSetCharacterHandling ARGS1(int,i)
     /* some diagnostics */
     if (TRACE) {
 	if (LYRawMode_flag != LYRawMode)
-	    CTRACE(tfp, "HTMLSetCharacterHandling: LYRawMode changed %s -> %s\n",
+	    CTRACE((tfp, "HTMLSetCharacterHandling: LYRawMode changed %s -> %s\n",
 			(LYRawMode_flag ? "ON" : "OFF"),
-			(LYRawMode	? "ON" : "OFF"));
+			(LYRawMode	? "ON" : "OFF")));
 	if (UCLYhndl_for_unspec_flag != UCLYhndl_for_unspec)
-	    CTRACE(tfp, "HTMLSetCharacterHandling: UCLYhndl_for_unspec changed %d -> %d\n",
+	    CTRACE((tfp, "HTMLSetCharacterHandling: UCLYhndl_for_unspec changed %d -> %d\n",
 			UCLYhndl_for_unspec_flag,
-			UCLYhndl_for_unspec);
+			UCLYhndl_for_unspec));
     }
 
     return;
diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c
index f21aa15e..e0de8686 100644
--- a/src/LYCharUtils.c
+++ b/src/LYCharUtils.c
@@ -1000,8 +1000,8 @@ PUBLIC void LYExpandString ARGS2(
 	**  The chartrans procedure failed, so we don't
 	**  do anything, and hope for the best. - FM
 	*/
-	CTRACE(tfp, "LYExpandString: Bad in (%d) or out (%d) handle(s).\n",
-		    me->inUCLYhndl, me->outUCLYhndl);
+	CTRACE((tfp, "LYExpandString: Bad in (%d) or out (%d) handle(s).\n",
+		    me->inUCLYhndl, me->outUCLYhndl));
 	return;
     }
 
@@ -1414,7 +1414,7 @@ PUBLIC void LYExpandString ARGS2(
 	*/
 	if (code == 8204 || code == 8205 ||
 	    code == 8206 || code == 8207) {
-	    CTRACE(tfp, "LYExpandString: Ignoring '%ld'.\n", code);
+	    CTRACE((tfp, "LYExpandString: Ignoring '%ld'.\n", code));
 	    if (me->T.decode_utf8 && *utf_buf) {
 		utf_buf[0] == '\0';
 		utf_buf_p = utf_buf;
@@ -2371,7 +2371,7 @@ PRIVATE char ** LYUCFullyTranslateString_1 ARGS9(
 		    */
 		} else if (code == 8204 || code == 8205 ||
 			   code == 8206 || code == 8207) {
-		    CTRACE(tfp, "LYUCFullyTranslateString: Ignoring '%ld'.\n", code);
+		    CTRACE((tfp, "LYUCFullyTranslateString: Ignoring '%ld'.\n", code));
 		    replace_buf[0] = '\0';
 		    state = S_got_outstring;
 		    break;
@@ -2705,10 +2705,10 @@ PUBLIC void LYHandleMETA ARGS4(
 	    FREE(content);
 	}
     }
-    CTRACE(tfp, "LYHandleMETA: HTTP-EQUIV=\"%s\" NAME=\"%s\" CONTENT=\"%s\"\n",
+    CTRACE((tfp, "LYHandleMETA: HTTP-EQUIV=\"%s\" NAME=\"%s\" CONTENT=\"%s\"\n",
 		(http_equiv ? http_equiv : "NULL"),
 		(name ? name : "NULL"),
-		(content ? content : "NULL"));
+		(content ? content : "NULL")));
 
     /*
      *	Make sure we have META name/value pairs to handle. - FM
@@ -2986,9 +2986,9 @@ PUBLIC void LYHandleMETA ARGS4(
 	    FREE(cp3);
 
 	    if (me->node_anchor->charset) {
-		CTRACE(tfp,
+		CTRACE((tfp,
 			"LYHandleMETA: New charset: %s\n",
-			me->node_anchor->charset);
+			me->node_anchor->charset));
 	    }
 	}
 	/*
@@ -3401,8 +3401,8 @@ PUBLIC void LYHandleSELECT ARGS5(
 	    /*
 	     *	Let the size be determined by the number of OPTIONs. - FM
 	     */
-	    CTRACE(tfp, "LYHandleSELECT: Ignoring SIZE=\"%s\" for SELECT.\n",
-			value[HTML_SELECT_SIZE]);
+	    CTRACE((tfp, "LYHandleSELECT: Ignoring SIZE=\"%s\" for SELECT.\n",
+			value[HTML_SELECT_SIZE]));
 #endif /* NOTDEFINED */
 	}
 
diff --git a/src/LYCookie.c b/src/LYCookie.c
index 977165b4..2fb56bc4 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -333,8 +333,8 @@ PRIVATE void store_cookie ARGS3(
 	    break;		/* will prompt later if we get that far */
 
 	case INVCHECK_STRICT:
-	    CTRACE(tfp, "store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
-		   co->path, path);
+	    CTRACE((tfp, "store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
+		   co->path, path));
 	    freeCookie(co);
 	    return;
 	}
@@ -348,8 +348,8 @@ PRIVATE void store_cookie ARGS3(
 	 *  The hostname does not contain a dot.
 	 */
 	if (strchr(hostname, '.') == NULL) {
-	    CTRACE(tfp, "store_cookie: Rejecting because '%s' has no dot.\n",
-		    hostname);
+	    CTRACE((tfp, "store_cookie: Rejecting because '%s' has no dot.\n",
+		    hostname));
 	    freeCookie(co);
 	    return;
 	}
@@ -362,15 +362,15 @@ PRIVATE void store_cookie ARGS3(
 	 *  value otherwise qualified. - FM
 	 */
 	if (co->domain[0] != '.' || co->domain[1] == '\0') {
-	    CTRACE(tfp, "store_cookie: Rejecting domain '%s'.\n",
-		    co->domain);
+	    CTRACE((tfp, "store_cookie: Rejecting domain '%s'.\n",
+		    co->domain));
 	    freeCookie(co);
 	    return;
 	}
 	ptr = strchr((co->domain + 1), '.');
 	if (ptr == NULL || ptr[1] == '\0') {
-	    CTRACE(tfp, "store_cookie: Rejecting domain '%s'.\n",
-		    co->domain);
+	    CTRACE((tfp, "store_cookie: Rejecting domain '%s'.\n",
+		    co->domain));
 	    freeCookie(co);
 	    return;
 	}
@@ -380,8 +380,8 @@ PRIVATE void store_cookie ARGS3(
 	 *  not domain-match the Domain attribute.
 	 */
 	if (!host_matches(hostname, co->domain)) {
-	    CTRACE(tfp, "store_cookie: Rejecting domain '%s' for host '%s'.\n",
-		    co->domain, hostname);
+	    CTRACE((tfp, "store_cookie: Rejecting domain '%s' for host '%s'.\n",
+		    co->domain, hostname));
 	    freeCookie(co);
 	    return;
 	}
@@ -408,8 +408,8 @@ PRIVATE void store_cookie ARGS3(
 		break;		/* will prompt later if we get that far */
 
 	    case INVCHECK_STRICT:
-		CTRACE(tfp, "store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
-		       co->path, path);
+		CTRACE((tfp, "store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
+		       co->path, path));
 		freeCookie(co);
 		return;
 	    }
@@ -431,9 +431,9 @@ PRIVATE void store_cookie ARGS3(
 		       co->domain,
 		       hostname);
 	    if (!HTConfirmDefault(msg, NO)) {
-		CTRACE(tfp, "store_cookie: Rejecting domain '%s' for host '%s'.\n",
+		CTRACE((tfp, "store_cookie: Rejecting domain '%s' for host '%s'.\n",
 					co->domain,
-					hostname);
+					hostname));
 		freeCookie(co);
 		FREE(msg);
 		return;
@@ -444,8 +444,8 @@ PRIVATE void store_cookie ARGS3(
 		       INVALID_COOKIE_PATH_CONFIRMATION,
 		       co->path, path);
 	    if (!HTConfirmDefault(msg, NO)) {
-		CTRACE(tfp, "store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
-		       co->path, path);
+		CTRACE((tfp, "store_cookie: Rejecting because '%s' is not a prefix of '%s'.\n",
+		       co->path, path));
 		freeCookie(co);
 		FREE(msg);
 		return;
@@ -547,7 +547,7 @@ PRIVATE void store_cookie ARGS3(
      *	Don't add the cookie if we're over the domain's limit. - FM
      */
     } else if (HTList_count(cookie_list) > max_cookies_domain) {
-	CTRACE(tfp, "store_cookie: Domain's cookie limit exceeded!  Rejecting cookie.\n");
+	CTRACE((tfp, "store_cookie: Domain's cookie limit exceeded!  Rejecting cookie.\n"));
 	freeCookie(co);
 	co = NULL;
 
@@ -555,7 +555,7 @@ PRIVATE void store_cookie ARGS3(
      *	Don't add the cookie if we're over the total cookie limit. - FM
      */
     } else if (total_cookies > max_cookies_global) {
-	CTRACE(tfp, "store_cookie: Total cookie limit exceeded!  Rejecting cookie.\n");
+	CTRACE((tfp, "store_cookie: Total cookie limit exceeded!  Rejecting cookie.\n"));
 	freeCookie(co);
 	co = NULL;
 
@@ -568,7 +568,7 @@ PRIVATE void store_cookie ARGS3(
 	 * - kw 1999-06-24
 	 */
     } else if (co->value == NULL) { /* should not happen - kw */
-	CTRACE(tfp, "store_cookie: Value is NULL! Not storing cookie.\n");
+	CTRACE((tfp, "store_cookie: Value is NULL! Not storing cookie.\n"));
 	freeCookie(co);
 	co = NULL;
 
@@ -632,11 +632,11 @@ PRIVATE char * scan_cookie_sublist ARGS6(
        if ((co) && /* speed-up host_matches() and limit trace output */
 	   (LYstrstr(hostname, co->domain) != NULL))
        {
-	    CTRACE(tfp, "Checking cookie %p %s=%s\n",
+	    CTRACE((tfp, "Checking cookie %p %s=%s\n",
 			hl,
 			(co->name ? co->name : "(no name)"),
-			(co->value ? co->value : "(no value)"));
-	    CTRACE(tfp, "\t%s %s %d %s %s %d%s\n",
+			(co->value ? co->value : "(no value)")));
+	    CTRACE((tfp, "\t%s %s %d %s %s %d%s\n",
 			hostname,
 			(co->domain ? co->domain : "(no domain)"),
 			host_matches(hostname, co->domain),
@@ -646,7 +646,7 @@ PRIVATE char * scan_cookie_sublist ARGS6(
 			    : 0,
 			(co->flags & COOKIE_FLAG_SECURE)
 			    ? " secure"
-			    : "");
+			    : ""));
 	}
 	/*
 	 *  Check if this cookie has expired, and if so, delete it.
@@ -833,7 +833,7 @@ PRIVATE void LYProcessSetCookies ARGS6(
      */
     p = (SetCookie2 ? SetCookie2 : "");
     if (SetCookie && *p) {
-	CTRACE(tfp, "LYProcessSetCookies: Using Set-Cookie2 header.\n");
+	CTRACE((tfp, "LYProcessSetCookies: Using Set-Cookie2 header.\n"));
     }
     while (NumCookies <= max_cookies_domain && *p) {
 	attr_start = attr_end = value_start = value_end = NULL;
@@ -1096,8 +1096,8 @@ PRIVATE void LYProcessSetCookies ARGS6(
 			 url_type == HTTPS_URL_TYPE)) {
 			length += strlen(cur_cookie->commentURL);
 		    } else {
-			CTRACE(tfp, "LYProcessSetCookies: Rejecting commentURL value '%s'\n",
-				    cur_cookie->commentURL);
+			CTRACE((tfp, "LYProcessSetCookies: Rejecting commentURL value '%s'\n",
+				    cur_cookie->commentURL));
 			FREE(cur_cookie->commentURL);
 		    }
 		}
@@ -1126,9 +1126,9 @@ PRIVATE void LYProcessSetCookies ARGS6(
 				   isdigit((unsigned char)*ptr))
 				ptr++;
 			    if (*ptr != '\0') {
-				CTRACE(tfp,
+				CTRACE((tfp,
 	       "LYProcessSetCookies: Adding lead dot for domain value '%s'\n",
-					    value);
+					    value));
 				StrAllocCopy(cur_cookie->domain, ".");
 				StrAllocCat(cur_cookie->domain, value);
 			    } else {
@@ -1212,9 +1212,9 @@ PRIVATE void LYProcessSetCookies ARGS6(
 			cur_cookie->expires = (time_t)0;
 		    } else {
 			cur_cookie->expires = (time(NULL) + temp);
-			CTRACE(tfp, "LYSetCookie: expires %ld, %s",
+			CTRACE((tfp, "LYSetCookie: expires %ld, %s",
 				    (long) cur_cookie->expires,
-				    ctime(&cur_cookie->expires));
+				    ctime(&cur_cookie->expires)));
 		    }
 		    MaxAgeAttrSet = TRUE;
 		}
@@ -1234,9 +1234,9 @@ PRIVATE void LYProcessSetCookies ARGS6(
 			cur_cookie->flags |= COOKIE_FLAG_EXPIRES_SET;
 			cur_cookie->expires = LYmktime(value, FALSE);
 			if (cur_cookie->expires > 0) {
-			    CTRACE(tfp, "LYSetCookie: expires %ld, %s",
+			    CTRACE((tfp, "LYSetCookie: expires %ld, %s",
 					(long) cur_cookie->expires,
-					ctime(&cur_cookie->expires));
+					ctime(&cur_cookie->expires)));
 			}
 		    }
 		}
@@ -1275,16 +1275,16 @@ PRIVATE void LYProcessSetCookies ARGS6(
 		    }
 		    HTList_appendObject(CombinedCookies, cur_cookie);
 		} else if (cur_cookie != NULL) {
-		    CTRACE(tfp,
+		    CTRACE((tfp,
 			"LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
 				(cur_cookie->name ?
 				 cur_cookie->name : "[no name]"),
 				(cur_cookie->value ?
-				 cur_cookie->value : "[no value]"));
-		    CTRACE(tfp,
+				 cur_cookie->value : "[no value]")));
+		    CTRACE((tfp,
 			   invalidport ?
 			   "                     due to excessive length!\n"
-			 : "                     due to invalid port!\n");
+			 : "                     due to invalid port!\n"));
 		    if (invalidport) {
 			NumCookies --;
 		    }
@@ -1326,23 +1326,23 @@ PRIVATE void LYProcessSetCookies ARGS6(
 	}
 	HTList_appendObject(CombinedCookies, cur_cookie);
     } else if (cur_cookie != NULL && !invalidport) {
-	CTRACE(tfp, "LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
+	CTRACE((tfp, "LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
 		    (cur_cookie->name ? cur_cookie->name : "[no name]"),
-		    (cur_cookie->value ? cur_cookie->value : "[no value]"));
-	CTRACE(tfp, "                     due to excessive %s%s%s\n",
+		    (cur_cookie->value ? cur_cookie->value : "[no value]")));
+	CTRACE((tfp, "                     due to excessive %s%s%s\n",
 		    (length > max_cookies_buffer ? "length" : ""),
 		    (length > max_cookies_buffer &&
 		     NumCookies > max_cookies_domain
 			? " and "
 			: ""),
-		    (NumCookies > max_cookies_domain ? "number!\n" : "!\n"));
+		    (NumCookies > max_cookies_domain ? "number!\n" : "!\n")));
 	freeCookie(cur_cookie);
 	cur_cookie = NULL;
     } else if (cur_cookie != NULL) {			/* invalidport */
-	CTRACE(tfp, "LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
+	CTRACE((tfp, "LYProcessSetCookies: Rejecting Set-Cookie2: %s=%s\n",
 		    (cur_cookie->name ? cur_cookie->name : "[no name]"),
-		    (cur_cookie->value ? cur_cookie->value : "[no value]"));
-	CTRACE(tfp, "                     due to invalid port!\n");
+		    (cur_cookie->value ? cur_cookie->value : "[no value]")));
+	CTRACE((tfp, "                     due to invalid port!\n"));
 	NumCookies --;
 	freeCookie(cur_cookie);
 	cur_cookie = NULL;
@@ -1357,7 +1357,7 @@ PRIVATE void LYProcessSetCookies ARGS6(
     cur_cookie = NULL;
     p = ((SetCookie && !(SetCookie2 && *SetCookie2)) ? SetCookie : "");
     if (SetCookie2 && *p) {
-	CTRACE(tfp, "LYProcessSetCookies: Using Set-Cookie header.\n");
+	CTRACE((tfp, "LYProcessSetCookies: Using Set-Cookie header.\n"));
     }
     while (NumCookies <= max_cookies_domain && *p) {
 	attr_start = attr_end = value_start = value_end = NULL;
@@ -1616,8 +1616,8 @@ PRIVATE void LYProcessSetCookies ARGS6(
 			 url_type == HTTPS_URL_TYPE)) {
 			length += strlen(cur_cookie->commentURL);
 		    } else {
-			CTRACE(tfp, "LYProcessSetCookies: Rejecting commentURL value '%s'\n",
-				    cur_cookie->commentURL);
+			CTRACE((tfp, "LYProcessSetCookies: Rejecting commentURL value '%s'\n",
+				    cur_cookie->commentURL));
 			FREE(cur_cookie->commentURL);
 		    }
 		}
@@ -1646,9 +1646,9 @@ PRIVATE void LYProcessSetCookies ARGS6(
 				   isdigit((unsigned char)*ptr))
 				ptr++;
 			    if (*ptr != '\0') {
-				CTRACE(tfp,
+				CTRACE((tfp,
 	       "LYProcessSetCookies: Adding lead dot for domain value '%s'\n",
-					    value);
+					    value));
 				StrAllocCopy(cur_cookie->domain, ".");
 				StrAllocCat(cur_cookie->domain, value);
 			    } else {
@@ -1784,12 +1784,12 @@ PRIVATE void LYProcessSetCookies ARGS6(
 		    }
 		    HTList_appendObject(CombinedCookies, cur_cookie);
 		} else if (cur_cookie != NULL) {
-		    CTRACE(tfp, "LYProcessSetCookies: Rejecting Set-Cookie: %s=%s\n",
+		    CTRACE((tfp, "LYProcessSetCookies: Rejecting Set-Cookie: %s=%s\n",
 				(cur_cookie->name ?
 				 cur_cookie->name : "[no name]"),
 				(cur_cookie->value ?
-				 cur_cookie->value : "[no value]"));
-		    CTRACE(tfp, "                     due to excessive length!\n");
+				 cur_cookie->value : "[no value]")));
+		    CTRACE((tfp, "                     due to excessive length!\n"));
 		    freeCookie(cur_cookie);
 		    cur_cookie = NULL;
 		}
@@ -1827,13 +1827,13 @@ PRIVATE void LYProcessSetCookies ARGS6(
 	}
 	HTList_appendObject(CombinedCookies, cur_cookie);
     } else if (cur_cookie != NULL) {
-	CTRACE(tfp, "LYProcessSetCookies: Rejecting Set-Cookie: %s=%s\n",
+	CTRACE((tfp, "LYProcessSetCookies: Rejecting Set-Cookie: %s=%s\n",
 		    (cur_cookie->name ? cur_cookie->name : "[no name]"),
-		    (cur_cookie->value ? cur_cookie->value : "[no value]"));
-	CTRACE(tfp, "                     due to excessive %s%s%s\n",
+		    (cur_cookie->value ? cur_cookie->value : "[no value]")));
+	CTRACE((tfp, "                     due to excessive %s%s%s\n",
 		    (length > max_cookies_buffer ? "length" : ""),
 		    (length > max_cookies_buffer && NumCookies > max_cookies_domain ? " and " : ""),
-		    (NumCookies > max_cookies_domain ? "number!\n" : "!\n"));
+		    (NumCookies > max_cookies_domain ? "number!\n" : "!\n")));
 	freeCookie(cur_cookie);
 	cur_cookie = NULL;
     }
@@ -1844,19 +1844,19 @@ PRIVATE void LYProcessSetCookies ARGS6(
      */
     cl = CombinedCookies;
     while (NULL != (co = (cookie *)HTList_nextObject(cl))) {
-	CTRACE(tfp, "LYProcessSetCookie: attr=value pair: '%s=%s'\n",
+	CTRACE((tfp, "LYProcessSetCookie: attr=value pair: '%s=%s'\n",
 			    (co->name ? co->name : "[no name]"),
-			    (co->value ? co->value : "[no value]"));
+			    (co->value ? co->value : "[no value]")));
 	if (co->expires > 0) {
-		CTRACE(tfp, "                    expires: %ld, %s\n",
+		CTRACE((tfp, "                    expires: %ld, %s\n",
 			    (long)co->expires,
-			    ctime(&co->expires));
+			    ctime(&co->expires)));
 	}
 	if (!strncasecomp(address, "https:", 6) &&
 	    LYForceSSLCookiesSecure == TRUE &&
 	    !(co->flags & COOKIE_FLAG_SECURE)) {
 	    co->flags |= COOKIE_FLAG_SECURE;
-	    CTRACE(tfp, "                    Forced the 'secure' flag on.\n");
+	    CTRACE((tfp, "                    Forced the 'secure' flag on.\n"));
 	}
 	store_cookie(co, hostname, path);
     }
@@ -1914,19 +1914,19 @@ PUBLIC void LYSetCookie ARGS3(
 	 */
 	BadHeaders = TRUE;
     }
-    CTRACE(tfp, "LYSetCookie called with host '%s', path '%s',\n",
+    CTRACE((tfp, "LYSetCookie called with host '%s', path '%s',\n",
 		(hostname ? hostname : ""),
-		(path ? path : ""));
+		(path ? path : "")));
     if (SetCookie) {
-	CTRACE(tfp, "    and Set-Cookie: '%s'\n",
-			 (SetCookie ? SetCookie : ""));
+	CTRACE((tfp, "    and Set-Cookie: '%s'\n",
+			 (SetCookie ? SetCookie : "")));
     }
     if (SetCookie2) {
-	CTRACE(tfp, "    and Set-Cookie2: '%s'\n",
-			 (SetCookie2 ? SetCookie2 : ""));
+	CTRACE((tfp, "    and Set-Cookie2: '%s'\n",
+			 (SetCookie2 ? SetCookie2 : "")));
     }
     if (LYSetCookies == FALSE || BadHeaders == TRUE) {
-	CTRACE(tfp, "    Ignoring this Set-Cookie/Set-Cookie2 request.\n");
+	CTRACE((tfp, "    Ignoring this Set-Cookie/Set-Cookie2 request.\n"));
     }
 
     /*
@@ -1961,10 +1961,10 @@ PUBLIC char * LYCookie ARGS4(
     HTList *hl = domain_list, *next = NULL;
     domain_entry *de;
 
-    CTRACE(tfp, "LYCookie: Searching for '%s:%d', '%s'.\n",
+    CTRACE((tfp, "LYCookie: Searching for '%s:%d', '%s'.\n",
 		(hostname ? hostname : "(null)"),
 		port,
-		(path ? path : "(null)"));
+		(path ? path : "(null)")));
 
     /*
      *	Search the cookie_list elements in the domain_list
@@ -2038,7 +2038,7 @@ PUBLIC void LYLoadCookies ARGS1 (
     if (!cookie_handle)
 	return;
 
-    CTRACE(tfp, "LYLoadCookies: reading cookies from %s\n", cookie_file);
+    CTRACE((tfp, "LYLoadCookies: reading cookies from %s\n", cookie_file));
 
     number_of_file_cookies = 0;
     while (LYSafeGets(&buf, cookie_handle) != 0) {
@@ -2082,12 +2082,12 @@ PUBLIC void LYLoadCookies ARGS1 (
 	 * sscanf(buf, "%s\t%s\t%s\t%s\t%d\t%s\t%[ -~]",
 	 *  domain, what, path, secure, &expires, name, value);
 	 */
-	CTRACE(tfp, "LYLoadCookies: tokenising %s\n", buf);
+	CTRACE((tfp, "LYLoadCookies: tokenising %s\n", buf));
 	tok_ptr = buf;
 	tok_out = LYstrsep(&tok_ptr, "\t");
 	for (tok_loop = 0; tok_out && tok_values[tok_loop].s; tok_loop++) {
-	    CTRACE(tfp, "\t%d:%p:%p:[%s]\n",
-		tok_loop, tok_values[tok_loop].s, tok_out, tok_out);
+	    CTRACE((tfp, "\t%d:%p:%p:[%s]\n",
+		tok_loop, tok_values[tok_loop].s, tok_out, tok_out));
 	    LYstrncpy(tok_values[tok_loop].s, tok_out, tok_values[tok_loop].n);
 	    /*
 	     * It looks like strtok ignores a leading delimiter,
@@ -2100,14 +2100,14 @@ PUBLIC void LYLoadCookies ARGS1 (
 
 	if (tok_values[tok_loop].s) {
 	    /* tok_out in above loop must have been NULL prematurely - kw */
-	    CTRACE(tfp, "*** wrong format: not enough tokens, ignoring line!\n");
+	    CTRACE((tfp, "*** wrong format: not enough tokens, ignoring line!\n"));
 	    continue;
 	}
 
 	expires = atol(expires_a);
-	CTRACE(tfp, "expires:\t%s\n", ctime(&expires));
-/* 	CTRACE(tfp, "%s\t%s\t%s\t%s\t%ld\t%s\t%s\tREADCOOKIE\n", */
-/* 	    domain, what, path, secure, (long) expires, name, value); */
+	CTRACE((tfp, "expires:\t%s\n", ctime(&expires)));
+/* 	CTRACE((tfp, "%s\t%s\t%s\t%s\t%ld\t%s\t%s\tREADCOOKIE\n", */
+/* 	    domain, what, path, secure, (long) expires, name, value)); */
 	moo = newCookie();
 	StrAllocCopy(moo->domain, domain);
 	StrAllocCopy(moo->path, path);
@@ -2197,7 +2197,7 @@ PUBLIC void LYStoreCookies ARGS1 (
 	return;
     }
 
-    CTRACE(tfp, "LYStoreCookies: save cookies to %s on exit\n", cookie_file);
+    CTRACE((tfp, "LYStoreCookies: save cookies to %s on exit\n", cookie_file));
 
     cookie_handle = LYNewTxtFile (cookie_file);
     if (cookie_handle == NULL) return;
@@ -2237,16 +2237,16 @@ PUBLIC void LYStoreCookies ARGS1 (
 	    if ((co = (cookie *)cl->object) == NULL)
 		continue;
 
-	    CTRACE(tfp, "LYStoreCookies: %ld cf %ld ", (long) now, (long) co->expires);
+	    CTRACE((tfp, "LYStoreCookies: %ld cf %ld ", (long) now, (long) co->expires));
 
 	    if ((co->flags & COOKIE_FLAG_DISCARD)) {
-		CTRACE(tfp, "not stored - DISCARD\n");
+		CTRACE((tfp, "not stored - DISCARD\n"));
 		continue;
 	    } else if (!(co->flags & COOKIE_FLAG_EXPIRES_SET)) {
-		CTRACE(tfp, "not stored - no expiration time\n");
+		CTRACE((tfp, "not stored - no expiration time\n"));
 		continue;
 	    } else if (co->expires <= now) {
-		CTRACE(tfp, "not stored - EXPIRED\n");
+		CTRACE((tfp, "not stored - EXPIRED\n"));
 		continue;
 	    }
 
@@ -2260,7 +2260,7 @@ PUBLIC void LYStoreCookies ARGS1 (
 		    co->value,
 		    (co->quoted ? "\"" : ""));
 
-	    CTRACE(tfp, "STORED\n");
+	    CTRACE((tfp, "STORED\n"));
 	}
     }
     fclose(cookie_handle);
diff --git a/src/LYCurses.c b/src/LYCurses.c
index 762bb6f6..2845ef24 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -137,7 +137,7 @@ PRIVATE void lynx_setup_attrs NOARGS
 
 PUBLIC void lynx_setup_colors NOARGS
 {
-    CTRACE(tfp, "lynx_setup_colors\n");
+    CTRACE((tfp, "lynx_setup_colors\n"));
     SLtt_set_color(0, NULL, DEFAULT_FG, DEFAULT_BG);
     SLtt_set_color(1, NULL, "blue",	DEFAULT_BG); /* bold */
     SLtt_set_color(2, NULL, "yellow",	"blue");     /* reverse */
@@ -294,7 +294,7 @@ PUBLIC void setStyle ARGS4(int,style,int,color,int,cattr,int,mono)
 PUBLIC void setHashStyle ARGS5(int,style,int,color,int,cattr,int,mono,char*,element)
 {
     bucket* ds=&hashStyles[style];
-    CTRACE(tfp, "CSS(SET): <%s> hash=%d, ca=%d, ma=%d\n", element, style, color, mono);
+    CTRACE((tfp, "CSS(SET): <%s> hash=%d, ca=%d, ma=%d\n", element, style, color, mono));
     ds->color=color;
     ds->cattr=cattr;
     ds->mono=mono;
@@ -311,7 +311,7 @@ PUBLIC void setHashStyle ARGS5(int,style,int,color,int,cattr,int,mono,char*,elem
  */
 PRIVATE int LYAttrset ARGS3(WINDOW*,win,int,color,int,mono)
 {
-	CTRACE(tfp, "CSS:LYAttrset (%#x, %#x)\n", color, mono);
+	CTRACE((tfp, "CSS:LYAttrset (%#x, %#x)\n", color, mono));
 	if (lynx_has_color && LYShowColor >= SHOW_COLOR_ON && color > -1)
 	{
 		wattrset(win,color);
@@ -348,13 +348,13 @@ PUBLIC void curses_w_style ARGS3(
 
 	if (!ds->name)
 	{
-		CTRACE(tfp, "CSS.CS:Style %d not configured\n",style);
+		CTRACE((tfp, "CSS.CS:Style %d not configured\n",style));
 #if !OMIT_SCN_KEEPING
 		return;
 #endif
 	}
 
-	CTRACE(tfp, "CSS.CS:<%s%s> (%d)\n",(dir?"":"/"),ds->name,ds->code);
+	CTRACE((tfp, "CSS.CS:<%s%s> (%d)\n",(dir?"":"/"),ds->name,ds->code));
 
 	getyx (win, YP, XP);
 
@@ -379,10 +379,10 @@ PUBLIC void curses_w_style ARGS3(
 
 	case STACK_ON: /* remember the current attributes */
 		if (last_colorattr_ptr > 127) {
-		    CTRACE(tfp,"........... %s (0x%x) %s\r\n",
+		    CTRACE((tfp,"........... %s (0x%x) %s\r\n",
 				"attribute cache FULL, dropping last",
 				last_styles[last_colorattr_ptr],
-				"in LynxChangeStyle(curses_w_style)");
+				"in LynxChangeStyle(curses_w_style)"));
 		    last_colorattr_ptr--;
 		}
 		last_styles[last_colorattr_ptr++] = getattrs(stdscr);
@@ -397,7 +397,7 @@ PUBLIC void curses_w_style ARGS3(
 #endif
 		if (style != s_alink)
 		{
-			CTRACE(tfp, "CACHED: <%s> @(%d,%d)\n", ds->name, YP, XP);
+			CTRACE((tfp, "CACHED: <%s> @(%d,%d)\n", ds->name, YP, XP));
 			if (win==stdscr) cached_styles[YP][XP]=style;
 		}
 		LYAttrset(win, ds->color, ds->mono);
@@ -407,7 +407,7 @@ PUBLIC void curses_w_style ARGS3(
 		/* don't cache style changes for active links */
 		if (style != s_alink)
 		{
-			CTRACE(tfp, "CACHED: <%s> @(%d,%d)\n", ds->name, YP, XP);
+			CTRACE((tfp, "CACHED: <%s> @(%d,%d)\n", ds->name, YP, XP));
 			if (win==stdscr) cached_styles[YP][XP]=style;
 		}
 		LYAttrset(win, ds->color, ds->mono);
@@ -424,14 +424,14 @@ PUBLIC void wcurses_css ARGS3(WINDOW *,win,char*,name,int,dir)
 	while (try_again)
 	{
 		int tmpHash=hash_code(name);
-		CTRACE(tfp, "CSSTRIM:trying to set [%s] style - ", name);
+		CTRACE((tfp, "CSSTRIM:trying to set [%s] style - ", name));
 		if (tmpHash==NOSTYLE) {
 			char *class=strrchr(name, '.');
-			CTRACE(tfp, "undefined, trimming at %p\n", class);
+			CTRACE((tfp, "undefined, trimming at %p\n", class));
 			if (class)	*class='\0';
 			else		try_again=0;
 		} else {
-			CTRACE(tfp, "ok (%d)\n", hash_code(name));
+			CTRACE((tfp, "ok (%d)\n", hash_code(name)));
 			curses_w_style(win, hash_code(name), dir);
 			try_again=0;
 		}
@@ -638,7 +638,7 @@ PUBLIC void lynx_setup_colors NOARGS
 PUBLIC void LYnoVideo ARGS1(
 	int,		a)
 {
-    CTRACE(tfp, "LYnoVideo(%d)\n", a);
+    CTRACE((tfp, "LYnoVideo(%d)\n", a));
 #if USE_SLANG
     if (a & 1) Masked_Attr |= SLTT_BOLD_MASK;
     if (a & 2) Masked_Attr |= SLTT_REV_MASK;
@@ -659,7 +659,7 @@ PUBLIC void start_curses NOARGS
     static int slinit;
 
     if (LYCursesON) {
-	CTRACE(tfp, "start_curses: Hmm, already ON.\n");
+	CTRACE((tfp, "start_curses: Hmm, already ON.\n"));
 	return;
     }
 
@@ -873,7 +873,7 @@ PUBLIC void start_curses NOARGS
 #endif
 
     LYCursesON = TRUE;
-    CTRACE(tfp, "start_curses: done.\n");
+    CTRACE((tfp, "start_curses: done.\n"));
 }  /* end of start_curses() */
 
 
@@ -990,7 +990,7 @@ PUBLIC void stop_curses NOARGS
     fflush(stderr);
 
     LYCursesON = FALSE;
-    CTRACE(tfp, "stop_curses: done.\n");
+    CTRACE((tfp, "stop_curses: done.\n"));
 
 #if defined(SIGTSTP) && defined(USE_SLANG)
 #ifndef VMS
diff --git a/src/LYDownload.c b/src/LYDownload.c
index 7501d886..eb74d163 100644
--- a/src/LYDownload.c
+++ b/src/LYDownload.c
@@ -248,7 +248,7 @@ check_recall:
 	/*
 	 *  See if we can write to it.
 	 */
-	CTRACE(tfp, "LYDownload: filename is %s\n", buffer);
+	CTRACE((tfp, "LYDownload: filename is %s\n", buffer));
 
 	if ((fp = fopen(buffer, "w")) != NULL) {
 	    fclose(fp);
@@ -267,12 +267,12 @@ check_recall:
 	/*
 	 *  Try rename() first. - FM
 	 */
-	CTRACE(tfp, "command: rename(%s, %s)\n", file, buffer);
+	CTRACE((tfp, "command: rename(%s, %s)\n", file, buffer));
 	if (rename(file, buffer)) {
 	    /*
 	     *	Failed.  Use spawned COPY_COMMAND. - FM
 	     */
-	    CTRACE(tfp, "         FAILED!\n");
+	    CTRACE((tfp, "         FAILED!\n"));
 	    LYCopyFile(file, buffer);
 	} else {
 	    /*
@@ -441,7 +441,7 @@ check_recall:
 	    goto failed;
 	}
 
-	CTRACE(tfp, "command: %s\n", the_command);
+	CTRACE((tfp, "command: %s\n", the_command));
 	stop_curses();
 	LYSystem(the_command);
 	FREE(the_command);
diff --git a/src/LYEdit.c b/src/LYEdit.c
index 2463cfd5..11f2e07c 100644
--- a/src/LYEdit.c
+++ b/src/LYEdit.c
@@ -84,7 +84,7 @@ PUBLIC int edit_current_file ARGS3(
 #else
 	HTAlert(COULD_NOT_ACCESS_FILE);
 #endif
-	CTRACE(tfp, "filename: '%s'\n", filename);
+	CTRACE((tfp, "filename: '%s'\n", filename));
 	goto done;
     }
 #else	/* !(VMS || !DOSPATH || !__EMX__) == UNIX */
@@ -192,7 +192,7 @@ PUBLIC int edit_current_file ARGS3(
 	HTEndParam(&command, format, params);
     }
 
-    CTRACE(tfp, "LYEdit: %s\n", command);
+    CTRACE((tfp, "LYEdit: %s\n", command));
     CTRACE_SLEEP(MessageSecs);
 
     /*
diff --git a/src/LYExtern.c b/src/LYExtern.c
index 5750bc2f..d0e2b974 100644
--- a/src/LYExtern.c
+++ b/src/LYExtern.c
@@ -200,7 +200,7 @@ void run_external ARGS1(char *, c)
 
 #ifdef WIN_EX
 	handle = GetForegroundWindow();
-	CTRACE(tfp, "EXTERNAL: '%s' <==> '%s'\n", externals2->name, c);
+	CTRACE((tfp, "EXTERNAL: '%s' <==> '%s'\n", externals2->name, c));
 #endif
 	if (externals2->command != 0
 	  && !strncasecomp(externals2->name, c, strlen(externals2->name)))
@@ -289,7 +289,7 @@ void run_external ARGS1(char *, c)
 		int len;
 		char buff[PATH_MAX];
 
-		CTRACE(tfp, "Lynx EXTERNAL: '%s'\n", cmdbuf);
+		CTRACE((tfp, "Lynx EXTERNAL: '%s'\n", cmdbuf));
 #ifdef WIN_GUI			/* 1997/11/06 (Thu) 14:17:15 */
 		confirmed = MessageBox(handle, cmdbuf,
 				  "Lynx (EXTERNAL COMMAND EXEC)",
diff --git a/src/LYForms.c b/src/LYForms.c
index d4aadd52..ac75a941 100644
--- a/src/LYForms.c
+++ b/src/LYForms.c
@@ -1149,14 +1149,14 @@ redraw:
 		number = get_popup_option_number((int *)&c,(int *)&rel);
 
 		/* handle + or - suffix */
-		CTRACE(tfp,"got popup option number %d, ",number);
-		CTRACE(tfp,"rel='%c', c='%c', cur_selection=%d\n",
-				rel,c,cur_selection);
+		CTRACE((tfp,"got popup option number %d, ",number));
+		CTRACE((tfp,"rel='%c', c='%c', cur_selection=%d\n",
+				rel,c,cur_selection));
 		if ( c == 'p' ) {
 		    int curpage = ((cur_selection + 1) > length) ?
 			(((cur_selection + 1) + (length - 1))/(length))
 					  : 1;
-		    CTRACE(tfp,"  curpage=%d\n",curpage);
+		    CTRACE((tfp,"  curpage=%d\n",curpage));
 		    if ( rel == '+' )
 			number = curpage + number;
 		    else if ( rel == '-' )
@@ -1166,7 +1166,7 @@ redraw:
 		} else if ( rel == '-' ) {
 		    number = cur_selection - number + 1;
 		}
-		if ( rel ) CTRACE(tfp,"new number=%d\n",number);
+		if ( rel ) CTRACE((tfp,"new number=%d\n",number));
 		/*
 		 *  Check for a 'p' suffix. - FM
 		 */
diff --git a/src/LYGetFile.c b/src/LYGetFile.c
index ef8c051c..f5713d68 100644
--- a/src/LYGetFile.c
+++ b/src/LYGetFile.c
@@ -81,7 +81,7 @@ PUBLIC int getfile ARGS1(
 	 *  Reset LYCancelDownload to prevent unwanted delayed effect. - KW
 	 */
 	if (LYCancelDownload) {
-	    CTRACE(tfp, "getfile:    resetting LYCancelDownload to FALSE\n");
+	    CTRACE((tfp, "getfile:    resetting LYCancelDownload to FALSE\n"));
 	    LYCancelDownload = FALSE;
 	}
 
@@ -137,7 +137,7 @@ Try_Redirected_URL:
 	 */
 	HTNoDataOK = 0;
 
-	CTRACE(tfp,"getfile: getting %s\n\n",doc->address);
+	CTRACE((tfp,"getfile: getting %s\n\n",doc->address));
 
 	/*
 	 *  Protect against denial of service attacks
@@ -273,7 +273,7 @@ Try_Redirected_URL:
 		      *(LYlist_temp_url()) &&
 		      !strncmp(WWWDoc.address, LYlist_temp_url(),
 			       strlen(LYlist_temp_url())))) {
-		    CTRACE(tfp, "getfile: dropping post_data!\n");
+		    CTRACE((tfp, "getfile: dropping post_data!\n"));
 		    HTAlert(IGNORED_POST);
 		    FREE(doc->post_data);
 		    FREE(doc->post_content_type);
@@ -709,8 +709,8 @@ Try_Redirected_URL:
 			if ((cp=strchr(doc->address+9, '/')) != NULL &&
 			   0==strncmp(++cp, "hGET%20/", 8)) {
 			    StrAllocCopy(tmp, "http://");
-			    CTRACE(tfp, "getfile: URL '%s'\n",
-					doc->address);
+			    CTRACE((tfp, "getfile: URL '%s'\n",
+					doc->address));
 			    *cp = '\0';
 			    StrAllocCat(tmp, doc->address+9);
 			   /*
@@ -723,8 +723,8 @@ Try_Redirected_URL:
 			    if (strlen(cp+7) > 1)
 				StrAllocCat(tmp, cp+8);
 			    StrAllocCopy(doc->address, tmp);
-			    CTRACE(tfp, "  changed to '%s'\n",
-					doc->address);
+			    CTRACE((tfp, "  changed to '%s'\n",
+					doc->address));
 			    FREE(tmp);
 			    url_type = HTTP_URL_TYPE;
 			}
@@ -755,8 +755,8 @@ Try_Redirected_URL:
 			    char *cp1 = strstr(doc->address, "/~");
 			    char *cp2;
 
-			    CTRACE(tfp, "getfile: URL '%s'\n",
-					doc->address);
+			    CTRACE((tfp, "getfile: URL '%s'\n",
+					doc->address));
 			    *cp1 = '\0';
 			    cp1 += 2;
 			    StrAllocCopy(temp, doc->address);
@@ -770,8 +770,8 @@ Try_Redirected_URL:
 			    }
 			    StrAllocCopy(doc->address, temp);
 			    FREE(temp);
-			    CTRACE(tfp, "  changed to '%s'\n",
-					doc->address);
+			    CTRACE((tfp, "  changed to '%s'\n",
+					doc->address));
 			    WWWDoc.address = doc->address;
 			}
 			FREE(cp);
@@ -918,16 +918,16 @@ Try_Redirected_URL:
 				 *  be positioned at the top of that document,
 				 *  so there's no harm done. - FM
 				 */
-				CTRACE(tfp,
+				CTRACE((tfp,
 			"getfile: Adding fragment '%s' to redirection URL.\n",
-				    pound);
+				    pound));
 				StrAllocCat(use_this_url_instead, pound);
 			    }
 			    CTRACE_SLEEP(MessageSecs);
 			    _user_message(WWW_USING_MESSAGE,
 					  use_this_url_instead);
 			    sleep(InfoSecs);
-			    CTRACE(tfp, "\n");
+			    CTRACE((tfp, "\n"));
 			    StrAllocCopy(doc->address,
 					use_this_url_instead);
 			    FREE(use_this_url_instead);
@@ -1060,7 +1060,7 @@ Try_Redirected_URL:
 	  } else {
 	      CTRACE_SLEEP(MessageSecs);
 	      HTUserMsg2(WWW_BAD_ADDR_MESSAGE, doc->address);
-	      CTRACE(tfp,"\n");
+	      CTRACE((tfp,"\n"));
 	      return(NULLFILE);
 	  }
 }
@@ -1094,7 +1094,7 @@ PUBLIC int follow_link_number ARGS4(
     BOOL want_go;
     int curline = *num; /* passed in from mainloop() */
 
-    CTRACE(tfp,"follow_link_number(%d,%d,...)\n",c,cur);
+    CTRACE((tfp,"follow_link_number(%d,%d,...)\n",c,cur));
     temp[0] = (char) c;
     temp[1] = '\0';
     *num = -1;
@@ -1122,14 +1122,14 @@ PUBLIC int follow_link_number ARGS4(
     }
     /* don't currently check for errors typing suffix */
 
-    CTRACE(tfp,"  temp=%s, *num=%d, rel='%c'\n",temp,*num,rel);
+    CTRACE((tfp,"  temp=%s, *num=%d, rel='%c'\n",temp,*num,rel));
     /*
      *	Check if we had a 'p' or 'P' following the number as
      *	a flag for displaying the page with that number. - FM
      */
     if (( c == 'p' || c == 'P') && display_lines == 0) {
-	CTRACE(tfp," curline=%d, LYlines=%d, display too small!\n",
-	       curline,LYlines);
+	CTRACE((tfp," curline=%d, LYlines=%d, display too small!\n",
+	       curline,LYlines));
 	return(PRINT_ERROR);
     } else if ( c == 'p' || c == 'P' ) {
 	int nlines = HText_getNumOfLines();
@@ -1139,8 +1139,8 @@ PUBLIC int follow_link_number ARGS4(
 	int curpage = ((curline + 1) > display_lines) ?
 		     (((curline + 1) + (display_lines - 1))/(display_lines))
 						      : 1;
-	CTRACE(tfp," nlines=%d, npages=%d, curline=%d, curpage=%d\n",
-		nlines,npages,curline,curpage);
+	CTRACE((tfp," nlines=%d, npages=%d, curline=%d, curpage=%d\n",
+		nlines,npages,curline,curpage));
 	if (*num < 1)
 	    *num = rel ? 0 : 1;
 	if ( rel == '+' )
@@ -1472,9 +1472,9 @@ PRIVATE int fix_httplike_urls ARGS2(
 	/*
 	 *  If we get to here, trim the trailing slash. - FM
 	 */
-	CTRACE(tfp, "fix_httplike_urls: URL '%s'\n", doc->address);
+	CTRACE((tfp, "fix_httplike_urls: URL '%s'\n", doc->address));
 	LYTrimHtmlSep(doc->address);
-	CTRACE(tfp, "            changed to '%s'\n", doc->address);
+	CTRACE((tfp, "            changed to '%s'\n", doc->address));
 	CTRACE_SLEEP(MessageSecs);
     }
 #endif /* DISABLE_FTP */
@@ -1498,9 +1498,9 @@ PRIVATE int fix_httplike_urls ARGS2(
 	    return(0);
 	}
     }
-    CTRACE(tfp, "fix_httplike_urls: URL '%s'\n", doc->address);
+    CTRACE((tfp, "fix_httplike_urls: URL '%s'\n", doc->address));
     LYAddHtmlSep(&(doc->address));
-    CTRACE(tfp, "            changed to '%s'\n", doc->address);
+    CTRACE((tfp, "            changed to '%s'\n", doc->address));
     CTRACE_SLEEP(MessageSecs);
 
     return(1);
diff --git a/src/LYHistory.c b/src/LYHistory.c
index 6edc58c0..93ff53fc 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -309,24 +309,24 @@ PUBLIC void LYpush ARGS2(
 			history[nhist].intern_seq_start =
 			    history[nhist-1].intern_seq_start >= 0 ?
 			    history[nhist-1].intern_seq_start : nhist-1;
-			CTRACE(tfp, "\nLYpush: pushed as internal link, OK\n");
+			CTRACE((tfp, "\nLYpush: pushed as internal link, OK\n"));
 		    }
 		}
 	    }
 	    if (!history[nhist].internal_link) {
-		CTRACE(tfp, "\nLYpush: push as internal link requested, %s\n",
-			    "but didn't check out!");
+		CTRACE((tfp, "\nLYpush: push as internal link requested, %s\n",
+			    "but didn't check out!"));
 	    }
 	}
-	CTRACE(tfp, "\nLYpush[%d]: address:%s\n        title:%s\n",
-		    nhist, doc->address, doc->title);
+	CTRACE((tfp, "\nLYpush[%d]: address:%s\n        title:%s\n",
+		    nhist, doc->address, doc->title));
 	nhist++;
     } else {
 	if (LYCursesON) {
 	    HTAlert(MAXHIST_REACHED);
 	}
-	CTRACE(tfp, "\nLYpush: MAXHIST reached for:\n        address:%s\n        title:%s\n",
-		    doc->address, doc->title);
+	CTRACE((tfp, "\nLYpush: MAXHIST reached for:\n        address:%s\n        title:%s\n",
+		    doc->address, doc->title));
     }
 }
 
@@ -357,8 +357,8 @@ PUBLIC void LYpop ARGS1(
 	/* assume we pop the 'doc' to show it soon... */
 	Newline_partial = doc->line;	/* reinitialize */
 #endif /* DISP_PARTIAL */
-	CTRACE(tfp, "LYpop[%d]: address:%s\n     title:%s\n",
-		    nhist, doc->address, doc->title);
+	CTRACE((tfp, "LYpop[%d]: address:%s\n     title:%s\n",
+		    nhist, doc->address, doc->title));
     }
 }
 
diff --git a/src/LYLeaks.c b/src/LYLeaks.c
index 0d8ff2bf..f4a5954c 100644
--- a/src/LYLeaks.c
+++ b/src/LYLeaks.c
@@ -467,9 +467,9 @@ PUBLIC char * LYLeakSACopy ARGS4(
 	CONST short,	ssi_Line)
 {
     if (src != NULL && src == *dest) {
-	CTRACE(tfp,
+	CTRACE((tfp,
 	       "LYLeakSACopy: *dest equals src, contains \"%s\"\n",
-	       src);
+	       src));
 	return *dest;
     }
     if (*dest) {
@@ -498,9 +498,9 @@ PUBLIC char * LYLeakSACat ARGS4(
 {
     if (src && *src) {
 	if (src == *dest) {
-	    CTRACE(tfp,
+	    CTRACE((tfp,
 		   "LYLeakSACat:  *dest equals src, contains \"%s\"\n",
-		   src);
+		   src));
 	    return *dest;
 	}
 	if (*dest) {
diff --git a/src/LYLocal.c b/src/LYLocal.c
index f2616fb1..cbb7f62f 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -297,7 +297,7 @@ PRIVATE BOOLEAN cannot_stat ARGS1(CONST char *, name)
 
 PRIVATE BOOLEAN ok_stat ARGS2(CONST char *, name, struct stat*, sb)
 {
-    CTRACE(tfp, "testing ok_stat(%s)\n", name);
+    CTRACE((tfp, "testing ok_stat(%s)\n", name));
     if (!OK_STAT(name, sb)) {
 	return cannot_stat(name);
     }
@@ -307,7 +307,7 @@ PRIVATE BOOLEAN ok_stat ARGS2(CONST char *, name, struct stat*, sb)
 #ifdef HAVE_LSTAT
 PRIVATE BOOLEAN ok_lstat ARGS2(char *, name, struct stat*, sb)
 {
-    CTRACE(tfp, "testing ok_lstat(%s)\n", name);
+    CTRACE((tfp, "testing ok_lstat(%s)\n", name));
     if (lstat(name, sb) < 0) {
 	return cannot_stat(name);
     }
@@ -337,7 +337,7 @@ PRIVATE BOOLEAN ok_localname ARGS2(char*, dst, CONST char*, src)
 	return FALSE;
     }
     if (strlen(src) >= DIRED_MAXBUF) {
-	CTRACE(tfp, "filename too long in ok_localname!\n");
+	CTRACE((tfp, "filename too long in ok_localname!\n"));
 	return FALSE;
     }
     strcpy(dst, src);
@@ -1229,9 +1229,9 @@ PRIVATE BOOLEAN permit_location ARGS3(
 		HTAlert(INVALID_PERMIT_URL);
 	    else
 		fprintf(stderr, "%s\n", INVALID_PERMIT_URL);
-	    CTRACE(tfp, "permit_location: called for <%s>.\n",
+	    CTRACE((tfp, "permit_location: called for <%s>.\n",
 			(destpath ?
-			 destpath : "NULL URL pointer"));
+			 destpath : "NULL URL pointer")));
 	    return 0;
 	}
 	cp = destpath;
@@ -1264,8 +1264,8 @@ PRIVATE BOOLEAN permit_location ARGS3(
 		HTAlert(INVALID_PERMIT_URL);
 	    else
 		fprintf(stderr, "%s\n", INVALID_PERMIT_URL);
-	    CTRACE(tfp, "permit_location: called for file '%s'.\n",
-			destpath);
+	    CTRACE((tfp, "permit_location: called for file '%s'.\n",
+			destpath));
 	    return 0;
 	}
 
@@ -1463,9 +1463,9 @@ PUBLIC int local_dired ARGS1(
     char *dirname = NULL;
 
     line_url = doc->address;
-    CTRACE(tfp, "local_dired: called for <%s>.\n",
+    CTRACE((tfp, "local_dired: called for <%s>.\n",
 		(line_url ?
-		 line_url : gettext("NULL URL pointer")));
+		 line_url : gettext("NULL URL pointer"))));
     HTUnEscapeSome(line_url, "/");	/* don't mess too much with *doc */
 
     StrAllocCopy(line, line_url);
@@ -1950,8 +1950,8 @@ PRIVATE int fill_argv_for_execv ARGS5(
 		cp = strtok(NULL, " ");
 	    }
 	    if (cp && (n >= LYEXECV_MAX_ARGC - reserve)) {
-		CTRACE(tfp, "Too many args for '%s' in '%s'!\n",
-		       cmd_path ? cmd_path : "<null>" , cmd_args);
+		CTRACE((tfp, "Too many args for '%s' in '%s'!\n",
+		       cmd_path ? cmd_path : "<null>" , cmd_args));
 		return(-1);
 	    }
 	} else {
@@ -2325,7 +2325,7 @@ PRIVATE int LYExecv ARGS3(
 	char *, 	msg)
 {
 #if defined(VMS) || defined(SH_EX) || defined(_WINDOWS)
-    CTRACE(tfp, "LYExecv:  Called inappropriately!\n");
+    CTRACE((tfp, "LYExecv:  Called inappropriately!\n"));
     return(0);
 #else
     int rc;
@@ -2347,9 +2347,9 @@ PRIVATE int LYExecv ARGS3(
 #endif
 
     if (TRACE) {
-	CTRACE(tfp, "LYExecv path='%s'\n", path);
+	CTRACE((tfp, "LYExecv path='%s'\n", path));
 	for (n = 0; argv[n] != 0; n++)
-	    CTRACE(tfp, "argv[%d] = '%s'\n", n, argv[n]);
+	    CTRACE((tfp, "argv[%d] = '%s'\n", n, argv[n]));
     }
 
     rc = 1;		/* It will work */
diff --git a/src/LYMail.c b/src/LYMail.c
index 274f95e7..9db9e1c1 100644
--- a/src/LYMail.c
+++ b/src/LYMail.c
@@ -746,10 +746,10 @@ PUBLIC void mailmsg ARGS4(
     char *command = NULL;
     BOOLEAN first = TRUE;
 
-    CTRACE(tfp, "mailmsg(%d, \"%s\", \"%s\", \"%s\")\n", cur,
+    CTRACE((tfp, "mailmsg(%d, \"%s\", \"%s\", \"%s\")\n", cur,
 	owner_address?owner_address:"<nil>",
 	filename?filename:"<nil>",
-	linkname?linkname:"<nil>");
+	linkname?linkname:"<nil>"));
 
     if (!strncasecomp(system_mail, "PMDF SEND", 9)) {
 	isPMDF = TRUE;
@@ -857,7 +857,7 @@ PUBLIC void mailmsg ARGS4(
 	address[(strlen(address) - 1)] = '\0';
     if (*address == '\0') {
 	FREE(address);
-	CTRACE(tfp, "mailmsg: No address in '%s'.\n", owner_address);
+	CTRACE((tfp, "mailmsg: No address in '%s'.\n", owner_address));
 	return;
     }
 
@@ -865,7 +865,7 @@ PUBLIC void mailmsg ARGS4(
     HTSprintf0(&cmd, "%s %s", system_mail, system_mail_flags);
     if ((fd = popen(cmd, "w")) == NULL) {
 	FREE(address);
-	CTRACE(tfp, "mailmsg: '%s' failed.\n", cmd);
+	CTRACE((tfp, "mailmsg: '%s' failed.\n", cmd));
 	return;
     }
 
@@ -879,14 +879,14 @@ PUBLIC void mailmsg ARGS4(
 #endif /* UNIX */
 #if defined(VMS) || defined(DOSPATH) || defined(WIN_EX)
     if ((fd = LYOpenTemp(my_tmpfile, ".txt", "w")) == NULL) {
-	CTRACE(tfp, "mailmsg: Could not fopen '%s'.\n", my_tmpfile);
+	CTRACE((tfp, "mailmsg: Could not fopen '%s'.\n", my_tmpfile));
 	FREE(address);
 	return;
     }
 #ifdef VMS
     if (isPMDF) {
 	if ((hfd = LYOpenTemp(hdrfile, ".txt", "w")) == NULL) {
-	    CTRACE(tfp, "mailmsg: Could not fopen '%s'.\n", hdrfile);
+	    CTRACE((tfp, "mailmsg: Could not fopen '%s'.\n", hdrfile));
 	    FREE(address);
 	    return;
 	}
@@ -1083,11 +1083,11 @@ PUBLIC void reply_by_mail ARGS4(
     int n;
 #endif /* VMS */
 
-    CTRACE(tfp, "reply_by_mail(\"%s\", \"%s\", \"%s\", \"%s\")\n",
+    CTRACE((tfp, "reply_by_mail(\"%s\", \"%s\", \"%s\", \"%s\")\n",
 	mail_address?mail_address:"<nil>",
 	filename?filename:"<nil>",
 	title?title:"<nil>",
-	refid?refid:"<nil>");
+	refid?refid:"<nil>"));
 
     term_letter = FALSE;
 
@@ -1723,7 +1723,7 @@ PUBLIC void reply_by_mail ARGS4(
      */
     sprintf(buf, "\n");
     StrAllocCat(header, buf);
-    CTRACE(tfp,"**header==\n%s",header);
+    CTRACE((tfp,"**header==\n%s",header));
 #endif /* !VMS */
 
     if (!no_editor && editor && *editor != '\0') {
@@ -2092,7 +2092,7 @@ PUBLIC void reply_by_mail ARGS4(
 #endif	/* DOSPATH */
     fclose(fd); /* Close the tmpfile. */
 
-    CTRACE(tfp, "%s\n", cmd);
+    CTRACE((tfp, "%s\n", cmd));
 #endif /* VMS */
 
     /*
diff --git a/src/LYMain.c b/src/LYMain.c
index f4aa9c40..f981594c 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1102,8 +1102,8 @@ PUBLIC int main ARGS2(
 		StrAllocCopy(lynx_lss_file, argv[i+1]);
 		i++;
 	    }
-	    CTRACE(tfp, "LYMain found -lss flag, lss file is %s\n",
-		    lynx_lss_file ? lynx_lss_file : "<NONE>");
+	    CTRACE((tfp, "LYMain found -lss flag, lss file is %s\n",
+		    lynx_lss_file ? lynx_lss_file : "<NONE>"));
 #endif
 	}
     }
@@ -1179,8 +1179,8 @@ PUBLIC int main ARGS2(
 		    if (*cp)
 			StrAllocCopy(lynx_lss_file, cp);
 		}
-		CTRACE(tfp, "LYMain found -lss flag, lss file is %s\n",
-			lynx_lss_file ? lynx_lss_file : "<NONE>");
+		CTRACE((tfp, "LYMain found -lss flag, lss file is %s\n",
+			lynx_lss_file ? lynx_lss_file : "<NONE>"));
 #endif
 	    } else if (argcmp(buf, "-get_data") == 0) {
 		/*
@@ -1339,7 +1339,7 @@ PUBLIC int main ARGS2(
 	} else {
 	    sprintf(temp, "JUMPFILE:%s", jumpfile);
 	    if (!LYJumpInit(temp)) {
-		CTRACE(tfp, "Failed to register %s\n", temp);
+		CTRACE((tfp, "Failed to register %s\n", temp));
 	    }
 	    FREE(temp);
 	}
@@ -1504,9 +1504,9 @@ PUBLIC int main ARGS2(
 	StrAllocCopy(LynxSigFile, filename);
 	LYAddPathToHome(filename, sizeof(filename), LynxSigFile);
 	StrAllocCopy(LynxSigFile, filename);
-	CTRACE(tfp, "LYNX_SIG_FILE set to '%s'\n", LynxSigFile);
+	CTRACE((tfp, "LYNX_SIG_FILE set to '%s'\n", LynxSigFile));
     } else {
-	CTRACE(tfp, "LYNX_SIG_FILE '%s' is bad. Ignoring.\n", LYNX_SIG_FILE);
+	CTRACE((tfp, "LYNX_SIG_FILE '%s' is bad. Ignoring.\n", LYNX_SIG_FILE));
     }
 
 #ifdef USE_PSRC
@@ -1906,7 +1906,7 @@ PUBLIC int main ARGS2(
 	ftp_ok = (BOOL)(!no_inside_ftp && !no_outside_ftp && ftp_ok);
 	rlogin_ok = (BOOL)(!no_inside_rlogin && !no_outside_rlogin && rlogin_ok);
 #else
-	CTRACE(tfp, "LYMain: User in Local domain\n");
+	CTRACE((tfp, "LYMain: User in Local domain\n"));
 	telnet_ok = (BOOL)(!no_inside_telnet && telnet_ok);
 #ifndef DISABLE_NEWS
 	news_ok = (BOOL)(!no_inside_news && news_ok);
@@ -1915,7 +1915,7 @@ PUBLIC int main ARGS2(
 	rlogin_ok = (BOOL)(!no_inside_rlogin && rlogin_ok);
 #endif /* !HAVE_UTMP || VMS */
     } else {
-	CTRACE(tfp, "LYMain: User in REMOTE domain\n");
+	CTRACE((tfp, "LYMain: User in REMOTE domain\n"));
 	telnet_ok = (BOOL)(!no_outside_telnet && telnet_ok);
 #ifndef DISABLE_NEWS
 	news_ok = (BOOL)(!no_outside_news && news_ok);
@@ -2154,7 +2154,7 @@ PUBLIC void reload_read_cfg NOARGS
 	}
 	if (strcmp(LYCookieFile, LYCookieFile_flag)) {
 	    StrAllocCopy(LYCookieFile, LYCookieFile_flag);
-	    CTRACE(tfp, "cookies file can be changed in next session only, restored.\n");
+	    CTRACE((tfp, "cookies file can be changed in next session only, restored.\n"));
 	}
 	FREE(LYCookieFile_flag);
 #endif
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index bde21255..c2c14f80 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -289,29 +289,29 @@ PUBLIC BOOLEAN LYOpenTraceLog NOARGS
 	 */
 	if (LYValidate) {
 	    if (LYRestricted && had_restrictions_default) {
-		CTRACE(tfp, "Validate and some anonymous restrictions are set.\n");
+		CTRACE((tfp, "Validate and some anonymous restrictions are set.\n"));
 	    } else if (had_restrictions_default) {
-		CTRACE(tfp, "Validate restrictions set, restriction \"default\" was given.\n");
+		CTRACE((tfp, "Validate restrictions set, restriction \"default\" was given.\n"));
 	    } else if (LYRestricted) {
-		CTRACE(tfp, "Validate restrictions set, additional anonymous restrictions ignored.\n");
+		CTRACE((tfp, "Validate restrictions set, additional anonymous restrictions ignored.\n"));
 	    } else {
-		CTRACE(tfp, "Validate restrictions are set.\n");
+		CTRACE((tfp, "Validate restrictions are set.\n"));
 	    }
 	    /* But none of the above can actually happen, since there should
 	     * never be a Trace Log with -validate.  If it appears in a log
 	     * file something went wrong! */
 	} else if (LYRestricted) {
 	    if (had_restrictions_all) {
-		CTRACE(tfp, "Anonymous restrictions set, restriction \"all\" was given.\n");
+		CTRACE((tfp, "Anonymous restrictions set, restriction \"all\" was given.\n"));
 	    } else {
-		CTRACE(tfp, "Anonymous restrictions are set.\n");
+		CTRACE((tfp, "Anonymous restrictions are set.\n"));
 	    }
 	} else if (had_restrictions_all && had_restrictions_default) {
-	    CTRACE(tfp, "Restrictions \"all\" and \"default\" were given.\n");
+	    CTRACE((tfp, "Restrictions \"all\" and \"default\" were given.\n"));
 	} else if (had_restrictions_default) {
-	    CTRACE(tfp, "Restriction \"default\" was given.\n");
+	    CTRACE((tfp, "Restriction \"default\" was given.\n"));
 	} else if (had_restrictions_all) {
-	    CTRACE(tfp, "\"all\" restrictions are set.\n");
+	    CTRACE((tfp, "\"all\" restrictions are set.\n"));
 	}
     }
     return TRUE;
@@ -329,7 +329,7 @@ PUBLIC void LYCloseTracelog NOARGS
 
 PRIVATE BOOLEAN LYReopenTracelog ARGS1(BOOLEAN *, trace_flag_ptr)
 {
-    CTRACE(tfp, "\nTurning off TRACE for fetch of log.\n");
+    CTRACE((tfp, "\nTurning off TRACE for fetch of log.\n"));
     LYCloseTracelog();
     if ((LYTraceLogFP = LYAppendToTxtFile(LYTraceLogPath)) == NULL) {
 	TracelogOpenFailed();
@@ -589,7 +589,7 @@ initialize:
 	refresh();
     }
 #endif /* USE_SLANG */
-    CTRACE(tfp,"Entering mainloop, startfile=%s\n",startfile);
+    CTRACE((tfp,"Entering mainloop, startfile=%s\n",startfile));
 
     if (form_post_data) {
 	StrAllocCopy(newdoc.post_data, form_post_data);
@@ -624,7 +624,7 @@ initialize:
 		FREE(newdoc.post_content_type);
 		newdoc.isHEAD = FALSE;
 		newdoc.safe = FALSE;
-		CTRACE(tfp, "Using bookmarks=%s\n", newdoc.address);
+		CTRACE((tfp, "Using bookmarks=%s\n", newdoc.address));
 	    } else {
 		HTUserMsg(BOOKMARKS_NOT_OPEN);
 		bookmark_start = FALSE;
@@ -1198,8 +1198,8 @@ try_again:
 				    if (!strcmp(homepage, startfile))
 					StrAllocCopy(homepage, newdoc.address);
 				    StrAllocCopy(startfile, newdoc.address);
-				    CTRACE(tfp, "Reloading as bookmarks=%s\n",
-						newdoc.address);
+				    CTRACE((tfp, "Reloading as bookmarks=%s\n",
+						newdoc.address));
 				    goto try_again;
 				}
 			    }
@@ -1466,7 +1466,7 @@ try_again:
 		}
 	    }
 	    FREE(temp);
-	    CTRACE(tfp, "Starting realm is '%s'\n\n", startrealm);
+	    CTRACE((tfp, "Starting realm is '%s'\n\n", startrealm));
 	    if (traversal) {
 		/*
 		 *  Set up the crawl output stuff.
@@ -1495,7 +1495,7 @@ try_again:
 		    }
 		    FREE(temp);
 		}
-		CTRACE(tfp, "Traversal host is '%s'\n\n", traversal_host);
+		CTRACE((tfp, "Traversal host is '%s'\n\n", traversal_host));
 	    }
 	    if (startfile) {
 		/*
@@ -3497,8 +3497,8 @@ new_cmd:  /*
 				    links[curdoc.link].form->submit_action,
 					  "lynxprog:", 9)) {
 			    HTAlert(SPECIAL_ACTION_DISALLOWED);
-			    CTRACE(tfp, "LYMainLoop: Rejected '%s'\n",
-					links[curdoc.link].form->submit_action);
+			    CTRACE((tfp, "LYMainLoop: Rejected '%s'\n",
+					links[curdoc.link].form->submit_action));
 			    HTOutputFormat = WWW_PRESENT;
 			    LYforce_no_cache = FALSE;
 			    reloading = FALSE;
@@ -5490,7 +5490,7 @@ if (!LYUseFormsOptions) {
 		cp = HTParse(curdoc.address, "", PARSE_PATH|PARSE_PUNCTUATION);
 		HTUnEscape(cp);
 		if (HTStat(cp, &stat_info) == -1) {
-		    CTRACE(tfp, "mainloop: Can't stat %s\n", cp);
+		    CTRACE((tfp, "mainloop: Can't stat %s\n", cp));
 		    FREE(cp);
 		    temp = (char *)calloc(1, (strlen(LYCSwingPath) + 4));
 		    if (temp == NULL)
@@ -6942,7 +6942,7 @@ PRIVATE void status_link ARGS3(
 		    buf[cut_from_pos + 4 + n] = buf[cut_to_pos + n];
 	    }
 	    _user_message(format, buf);
-	    CTRACE(tfp,"lastline = %s\n",buf); /* don't forget to erase me */
+	    CTRACE((tfp,"lastline = %s\n",buf)); /* don't forget to erase me */
 	    FREE(buf);
 	} else {	/* show (possibly truncated) url */
 	    _user_message(format, curlink_name);
diff --git a/src/LYNews.c b/src/LYNews.c
index 75bd26d2..2425c365 100644
--- a/src/LYNews.c
+++ b/src/LYNews.c
@@ -37,8 +37,8 @@ PRIVATE BOOLEAN message_has_content ARGS1(
     BOOLEAN in_headers = TRUE;
 
     if (!filename || (fp = fopen(filename, "r")) == NULL) {
-	CTRACE(tfp, "Failed to open file %s for reading!\n",
-	       filename ? filename : "(<null>)");
+	CTRACE((tfp, "Failed to open file %s for reading!\n",
+	       filename ? filename : "(<null>)"));
 	return FALSE;
     }
     while (LYSafeGets(&buffer, fp) != NULL) {
diff --git a/src/LYOptions.c b/src/LYOptions.c
index d199eea6..60fe6e4c 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -3986,11 +3986,11 @@ PUBLIC int postoptions ARGS1(
      *  Exit: working around the previous document.
      *  Being out of mainloop()/getfile() cycle, do things manually.
      */
-    CTRACE(tfp, "\nLYOptions.c/postoptions(): exiting...\n");
-    CTRACE(tfp, "                            need_reload = %s\n",
-                    need_reload ? "TRUE" : "FALSE");
-    CTRACE(tfp, "                            need_end_reload = %s\n",
-		    need_end_reload ? "TRUE" : "FALSE");
+    CTRACE((tfp, "\nLYOptions.c/postoptions(): exiting...\n"));
+    CTRACE((tfp, "                            need_reload = %s\n",
+                    need_reload ? "TRUE" : "FALSE"));
+    CTRACE((tfp, "                            need_end_reload = %s\n",
+		    need_end_reload ? "TRUE" : "FALSE"));
 
     /*  Options menu was pushed before postoptions(), so pop-up. */
     LYpop(newdoc);
@@ -4070,7 +4070,7 @@ PUBLIC int postoptions ARGS1(
 
     if (need_reload == FALSE) {
 	/*  no uncache, already loaded */
-	CTRACE(tfp, "LYOptions.c/postoptions(): now really exit.\n\n");
+	CTRACE((tfp, "LYOptions.c/postoptions(): now really exit.\n\n"));
 	return(NORMAL);
     } else {
 	/*  update HText cache */
@@ -4092,7 +4092,7 @@ PUBLIC int postoptions ARGS1(
 	if (reloading == FALSE) {
 	    /* one more attempt to be smart enough: */
 	    if (HTreparse_document()) {
-		CTRACE(tfp, "LYOptions.c/postoptions(): now really exit.\n\n");
+		CTRACE((tfp, "LYOptions.c/postoptions(): now really exit.\n\n"));
 		return(NORMAL);
 	    }
 	}
@@ -4101,7 +4101,7 @@ PUBLIC int postoptions ARGS1(
 	/*  uncache and load again */
 	HTuncache_current_document();
 	LYpush(newdoc, FALSE);
-	CTRACE(tfp, "LYOptions.c/postoptions(): now really exit.\n\n");
+	CTRACE((tfp, "LYOptions.c/postoptions(): now really exit.\n\n"));
 	return(NULLFILE);
     }
 
diff --git a/src/LYPrint.c b/src/LYPrint.c
index d775e43a..817f5d04 100644
--- a/src/LYPrint.c
+++ b/src/LYPrint.c
@@ -364,7 +364,7 @@ check_recall:
     /*
      * See if we can write to it.
      */
-    CTRACE(tfp, "LYPrint: filename is %s, action is `%c'\n", buffer, c);
+    CTRACE((tfp, "LYPrint: filename is %s, action is `%c'\n", buffer, c));
 
 #if HAVE_POPEN
     if (*buffer == '|') {
@@ -374,7 +374,7 @@ check_recall:
 	    FnameNum = FnameTotal;
 	    goto retry;
 	} else if ((outfile_fp = popen(buffer+1, "w")) == NULL) {
-	    CTRACE(tfp, "LYPrint: errno is %d\n", errno);
+	    CTRACE((tfp, "LYPrint: errno is %d\n", errno));
 	    HTAlert(CANNOT_WRITE_TO_FILE);
 	    _statusline(NEW_FILENAME_PROMPT);
 	    FirstRecall = TRUE;
@@ -386,7 +386,7 @@ check_recall:
     if ((outfile_fp = (TOUPPER(c) == 'A'
 	    ? LYAppendToTxtFile(buffer)
 	    : LYNewTxtFile(buffer))) == NULL) {
-	CTRACE(tfp, "LYPrint: errno is %d\n", errno);
+	CTRACE((tfp, "LYPrint: errno is %d\n", errno));
 	HTAlert(CANNOT_WRITE_TO_FILE);
 	_statusline(NEW_FILENAME_PROMPT);
 	FirstRecall = TRUE;
@@ -931,7 +931,7 @@ check_again:
     move(1,1);
 
     stop_curses();
-    CTRACE(tfp, "command: %s\n", the_command);
+    CTRACE((tfp, "command: %s\n", the_command));
     SetOutputMode( O_TEXT );
     printf(PRINTING_FILE);
     /*
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 21671223..5dfd2998 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -617,7 +617,7 @@ static int jumpfile_fun ARGS1(
 
     HTSprintf0 (&buffer, "JUMPFILE:%s", value);
     if (!LYJumpInit(buffer))
-	CTRACE(tfp, "Failed to register %s\n", buffer);
+	CTRACE((tfp, "Failed to register %s\n", buffer));
     FREE(buffer);
 
     return 0;
@@ -628,7 +628,7 @@ static int keyboard_layout_fun ARGS1(
 	char *,		key)
 {
     if (!LYSetKbLayout(key))
-	CTRACE(tfp, "Failed to set keyboard layout %s\n", key);
+	CTRACE((tfp, "Failed to set keyboard layout %s\n", key));
     return 0;
 }
 #endif /* EXP_KEYBOARD_LAYOUT */
@@ -719,9 +719,9 @@ static int lynx_sig_file_fun ARGS1(
 	StrAllocCopy(LynxSigFile, temp);
 	LYAddPathToHome(temp, sizeof(temp), LynxSigFile);
 	StrAllocCopy(LynxSigFile, temp);
-	CTRACE(tfp, "LYNX_SIG_FILE set to '%s'\n", LynxSigFile);
+	CTRACE((tfp, "LYNX_SIG_FILE set to '%s'\n", LynxSigFile));
     } else {
-	CTRACE(tfp, "LYNX_SIG_FILE '%s' is bad. Ignoring.\n", LYNX_SIG_FILE);
+	CTRACE((tfp, "LYNX_SIG_FILE '%s' is bad. Ignoring.\n", LYNX_SIG_FILE));
     }
     return 0;
 }
@@ -938,11 +938,11 @@ PRIVATE int parse_charset_choice ARGS2(
     /*only one charset choice is allowed per line!*/
     LYTrimHead(p);
     LYTrimTail(p);
-    CTRACE(tfp, "parsing charset choice for %s:\"%s\"",
-	(display_charset ? "display charset" : "assumed doc charset"), p);
+    CTRACE((tfp, "parsing charset choice for %s:\"%s\"",
+	(display_charset ? "display charset" : "assumed doc charset"), p));
     len = strlen(p);
     if (!len) {
-	CTRACE(tfp," - EMPTY STRING\n");
+	CTRACE((tfp," - EMPTY STRING\n"));
 	return 1;
     }
     if (*p == '*' && len == 1) {
@@ -952,7 +952,7 @@ PRIVATE int parse_charset_choice ARGS2(
 	else
 	    for (custom_assumed_doc_charset = TRUE, i = 0; i < LYNumCharsets; ++i)
 		charset_subsets[i].hide_assumed = FALSE;
-	CTRACE(tfp," - all unhidden\n");
+	CTRACE((tfp," - all unhidden\n"));
 	return 0;
     }
     if (p[len-1] == '*') {
@@ -964,19 +964,19 @@ PRIVATE int parse_charset_choice ARGS2(
 		matched_charset_choice(display_charset, i);
 	    }
 	}
-	CTRACE(tfp," - %d matches\n", matches);
+	CTRACE((tfp," - %d matches\n", matches));
 	return 0;
     } else {
 	for (i = 0; i < LYNumCharsets; ++i) {
 	    if ((!strcasecmp(p,LYchar_set_names[i])) ||
 		(!strcasecmp(p,LYCharSet_UC[i].MIMEname)) ) {
 		matched_charset_choice(display_charset, i);
-		CTRACE(tfp," - OK\n");
+		CTRACE((tfp," - OK\n"));
 		++matches;
 		return 0;
 	    }
 	}
-	CTRACE(tfp," - NOT recognised\n");
+	CTRACE((tfp," - NOT recognised\n"));
 	return 1;
     }
 }
@@ -1070,12 +1070,12 @@ static int read_htmlsrc_attrname_xform ARGS1( char*,str)
     int val;
     if ( 1 == sscanf(str, "%d", &val) ) {
 	if (val<0 || val >2) {
-	    CTRACE(tfp,"bad value for htmlsrc_attrname_xform (ignored - must be one of 0,1,2): %d\n", val);
+	    CTRACE((tfp,"bad value for htmlsrc_attrname_xform (ignored - must be one of 0,1,2): %d\n", val));
 	} else
 	    attrname_transform = val;
     } else {
-	CTRACE(tfp,"bad value for htmlsrc_attrname_xform (ignored): %s\n",
-		    str);
+	CTRACE((tfp,"bad value for htmlsrc_attrname_xform (ignored): %s\n",
+		    str));
     }
     return 0;
 }
@@ -1085,12 +1085,12 @@ static int read_htmlsrc_tagname_xform ARGS1( char*,str)
     int val;
     if ( 1 == sscanf(str,"%d",&val) ) {
 	if (val<0 || val >2) {
-	    CTRACE(tfp,"bad value for htmlsrc_tagname_xform (ignored - must be one of 0,1,2): %d\n", val);
+	    CTRACE((tfp,"bad value for htmlsrc_tagname_xform (ignored - must be one of 0,1,2): %d\n", val));
 	} else
 	    tagname_transform = val;
     } else {
-	CTRACE(tfp,"bad value for htmlsrc_tagname_xform (ignored): %s\n",
-		    str);
+	CTRACE((tfp,"bad value for htmlsrc_tagname_xform (ignored): %s\n",
+		    str));
     }
     return 0;
 }
@@ -1457,7 +1457,7 @@ PRIVATE void do_read_cfg ARGS5(
     char mypath[LY_MAXPATH];
     char *buffer = 0;
 
-    CTRACE(tfp, "Loading cfg file '%s'.\n", cfg_filename);
+    CTRACE((tfp, "Loading cfg file '%s'.\n", cfg_filename));
 
     /*
      *	Don't get hung up by an include file loop.  Arbitrary max depth
@@ -1475,7 +1475,7 @@ PRIVATE void do_read_cfg ARGS5(
      *	Locate and open the file.
      */
     if (!cfg_filename || strlen(cfg_filename) == 0) {
-	CTRACE(tfp,"No filename following -cfg switch!\n");
+	CTRACE((tfp,"No filename following -cfg switch!\n"));
 	return;
     }
     if (!strncmp(cfg_filename, "~/", 2)) {
@@ -1484,7 +1484,7 @@ PRIVATE void do_read_cfg ARGS5(
 	cfg_filename = mypath;
     }
     if ((fp = fopen(cfg_filename, TXT_R)) == 0) {
-	CTRACE(tfp,"lynx.cfg file not found as %s\n",cfg_filename);
+	CTRACE((tfp,"lynx.cfg file not found as %s\n",cfg_filename));
 	return;
     }
     have_read_cfg = TRUE;
diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c
index 1c8af4d7..3170ecc9 100644
--- a/src/LYShowInfo.c
+++ b/src/LYShowInfo.c
@@ -120,7 +120,7 @@ PUBLIC int showinfo ARGS4(
 	FREE(s);
 
 	if (lstat(temp, &dir_info) == -1) {
-	    CTRACE(tfp, "lstat(%s) failed, errno=%d\n", temp, errno);
+	    CTRACE((tfp, "lstat(%s) failed, errno=%d\n", temp, errno));
 	    HTAlert(CURRENT_LINK_STATUS_FAILED);
 	} else {
 	    char modes[80];
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 7e7e4ddf..1806d0cc 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -997,32 +997,32 @@ PRIVATE int setkey_cmd (char *parse)
     int keysym;
     char buf[BUFSIZ];
 
-    CTRACE(tfp, "KEYMAP(PA): in=%s", parse);	/* \n-terminated */
+    CTRACE((tfp, "KEYMAP(PA): in=%s", parse));	/* \n-terminated */
     if ((s = skip_keysym(parse)) != 0) {
 	if (isspace(*s)) {
 	    *s++ = '\0';
 	    s = LYSkipBlanks(s);
 	    if ((t = skip_keysym(s)) == 0) {
-		CTRACE(tfp, "KEYMAP(SKIP) no key expansion found\n");
+		CTRACE((tfp, "KEYMAP(SKIP) no key expansion found\n"));
 		return -1;
 	    }
 	    if (t != s)
 		*t = '\0';
 	    if (map_string_to_keysym (s, &keysym) >= 0
 	     && unescape_string(parse, buf)) {
-		CTRACE(tfp, "KEYMAP(DEF) keysym=%#x, seq='%s'\n", keysym, buf);
+		CTRACE((tfp, "KEYMAP(DEF) keysym=%#x, seq='%s'\n", keysym, buf));
 		return define_key(buf, keysym);
 	    }
 	    else {
-		CTRACE(tfp, "KEYMAP(SKIP) could not map to keysym\n");
+		CTRACE((tfp, "KEYMAP(SKIP) could not map to keysym\n"));
 	    }
 	}
 	else {
-	    CTRACE(tfp, "KEYMAP(SKIP) junk after key description: '%s'\n", s);
+	    CTRACE((tfp, "KEYMAP(SKIP) junk after key description: '%s'\n", s));
 	}
     }
     else {
-	CTRACE(tfp, "KEYMAP(SKIP) no key description\n");
+	CTRACE((tfp, "KEYMAP(SKIP) no key description\n"));
     }
     return -1;
 }
@@ -1417,15 +1417,15 @@ re_read:
     if (c == EOF && errno == EINTR) {
 
 #if HAVE_SIZECHANGE || defined(USE_SLANG)
-	   CTRACE(tfp, "Got EOF with EINTR, recent_sizechange so far is %d\n",
-		  recent_sizechange);
+	   CTRACE((tfp, "Got EOF with EINTR, recent_sizechange so far is %d\n",
+		  recent_sizechange));
 	   if (!recent_sizechange) { /* not yet detected by ourselves */
 	       size_change(0);
-	       CTRACE(tfp, "Now recent_sizechange is %d\n", recent_sizechange);
+	       CTRACE((tfp, "Now recent_sizechange is %d\n", recent_sizechange));
 	   }
 #else /* HAVE_SIZECHANGE || USE_SLANG */
-	   CTRACE(tfp, "Got EOF with EINTR, recent_sizechange is %d\n",
-		  recent_sizechange);
+	   CTRACE((tfp, "Got EOF with EINTR, recent_sizechange is %d\n",
+		  recent_sizechange));
 #endif /* HAVE_SIZECHANGE || USE_SLANG */
 #if !defined(UCX) || !defined(VAXC) /* errno not modifiable ? */
 	errno = 0;		/* reset - kw */
@@ -1597,7 +1597,7 @@ re_read:
 		done_esc = (BOOL) ((a & ~0xFF) == 0);
 		break;
 	    }
-	    CTRACE(tfp,"Unknown key sequence: %d:%d:%d\n",c,b,a);
+	    CTRACE((tfp,"Unknown key sequence: %d:%d:%d\n",c,b,a));
 	    CTRACE_SLEEP(MessageSecs);
 	    break;
 	}
@@ -1770,13 +1770,13 @@ re_read:
 	   /* Make call to detect new size, if that may be implemented.
 	    * The call may set recent_sizechange (except for USE_SLANG),
 	    * which will tell mainloop() to refresh. - kw */
-	   CTRACE(tfp, "Got KEY_RESIZE, recent_sizechange so far is %d\n",
-		  recent_sizechange);
+	   CTRACE((tfp, "Got KEY_RESIZE, recent_sizechange so far is %d\n",
+		  recent_sizechange));
 	   size_change(0);
-	   CTRACE(tfp, "Now recent_sizechange is %d\n", recent_sizechange);
+	   CTRACE((tfp, "Now recent_sizechange is %d\n", recent_sizechange));
 #else /* HAVE_SIZECHANGE || USE_SLANG */
-	   CTRACE(tfp, "Got KEY_RESIZE, recent_sizechange is %d\n",
-		  recent_sizechange);
+	   CTRACE((tfp, "Got KEY_RESIZE, recent_sizechange is %d\n",
+		  recent_sizechange));
 #endif /* HAVE_SIZECHANGE || USE_SLANG */
 	   if (!recent_sizechange) {
 #if 0			/* assumption seems flawed? */
@@ -1845,7 +1845,7 @@ re_read:
 		mouse_link = -1;
 		err = getmouse(&event);
 		if (err != OK) {
-		    CTRACE(tfp, "Mouse error: no event available!\n");
+		    CTRACE((tfp, "Mouse error: no event available!\n"));
 		    return(code==FOR_PANEL ? 0 : DO_NOTHING);
 		}
 		levent = event;		/* Allow setting pos in entry fields */
@@ -3755,7 +3755,7 @@ PUBLIC char * SNACopy ARGS3(
     if (src) {
 	*dest = (char *)calloc(1, n + 1);
 	if (*dest == NULL) {
-	    CTRACE(tfp, "Tried to calloc %d bytes\n", n);
+	    CTRACE((tfp, "Tried to calloc %d bytes\n", n));
 	    outofmem(__FILE__, "SNACopy");
 	}
 	strncpy (*dest, src, n);
diff --git a/src/LYStyle.c b/src/LYStyle.c
index 0b8a5dd1..d7444539 100644
--- a/src/LYStyle.c
+++ b/src/LYStyle.c
@@ -1,6 +1,6 @@
 /* character level styles for Lynx
  * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
- * @Id: LYStyle.c 1.32 Thu, 26 Aug 1999 05:31:19 -0600 dickey @
+ * @Id: LYStyle.c 1.33 Wed, 29 Sep 1999 05:40:39 -0600 dickey @
  */
 #include <HTUtils.h>
 #include <HTML.h>
@@ -84,7 +84,7 @@ PRIVATE void parse_attributes ARGS5(char*,mono,char*,fg,char*,bg,int,style,char*
     int mA = 0, fA = default_fg, bA = default_bg, cA = A_NORMAL;
     int newstyle = hash_code(element);
 
-    CTRACE(tfp, "CSS(PA):style d=%d / h=%d, e=%s\n", style, newstyle,element);
+    CTRACE((tfp, "CSS(PA):style d=%d / h=%d, e=%s\n", style, newstyle,element));
 
     for (i = 0; i < (int)TABLESIZE(Mono_Strings); i++)
     {
@@ -121,13 +121,13 @@ PRIVATE void parse_attributes ARGS5(char*,mono,char*,fg,char*,bg,int,style,char*
 	    }
 	}
     }
-    CTRACE(tfp, "CSS(CP):%d\n", colorPairs);
+    CTRACE((tfp, "CSS(CP):%d\n", colorPairs));
 
     fA = check_color(fg, default_fg);
     bA = check_color(bg, default_bg);
 
     if (style == -1) {			/* default */
-	CTRACE(tfp, "CSS(DEF):default_fg=%d, default_bg=%d\n", fA, bA);
+	CTRACE((tfp, "CSS(DEF):default_fg=%d, default_bg=%d\n", fA, bA));
 	default_fg = fA;
 	default_bg = bA;
 	return;
@@ -167,7 +167,7 @@ PRIVATE void parse_attributes ARGS5(char*,mono,char*,fg,char*,bg,int,style,char*
 	     && curPair < 255)
 		our_pairs[cA == A_BOLD][fA][bA] = curPair + 1;
 	}
-	CTRACE(tfp, "CSS(CURPAIR):%d\n", colorPairs);
+	CTRACE((tfp, "CSS(CURPAIR):%d\n", colorPairs));
 	if (style < DSTYLE_ELEMENTS)
 	    setStyle(style, COLOR_PAIR(curPair)|cA, cA, mA);
 	setHashStyle(newstyle, COLOR_PAIR(curPair)|cA, cA, mA, element);
@@ -175,7 +175,7 @@ PRIVATE void parse_attributes ARGS5(char*,mono,char*,fg,char*,bg,int,style,char*
     else
     {
 	if (lynx_has_color && fA != NO_COLOR) {
-	    CTRACE(tfp, "CSS(NC): maximum of %d colorpairs exhausted\n", COLOR_PAIRS - 1);
+	    CTRACE((tfp, "CSS(NC): maximum of %d colorpairs exhausted\n", COLOR_PAIRS - 1));
 	}
 	/* only mono is set */
 	if (style < DSTYLE_ELEMENTS)
@@ -235,9 +235,9 @@ where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n\n"), buffer);
 	}
     }
 
-    CTRACE(tfp, "CSSPARSE:%s => %d %s\n",
+    CTRACE((tfp, "CSSPARSE:%s => %d %s\n",
 		element, hash_code(element),
-		(hashStyles[hash_code(element)].name ? "used" : ""));
+		(hashStyles[hash_code(element)].name ? "used" : "")));
 
     strtolower(element);
 
@@ -300,7 +300,7 @@ where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n\n"), buffer);
 	{
 	    if (!strcasecomp (HTML_dtd.tags[i].name, element))
 	    {
-		CTRACE(tfp, "PARSECSS:applying style <%s,%s,%s> for HTML_%s\n",mono,fg,bg,HTML_dtd.tags[i].name);
+		CTRACE((tfp, "PARSECSS:applying style <%s,%s,%s> for HTML_%s\n",mono,fg,bg,HTML_dtd.tags[i].name));
 			parse_attributes(mono,fg,bg,i+STARTAT,element);
 		break;
 	    }
@@ -392,7 +392,7 @@ PUBLIC void parse_userstyles NOARGS
 
 	while ((name = HTList_nextObject(cur)) != NULL)
 	{
-		CTRACE(tfp, "LSS:%s\n", name ? name : "!?! empty !?!");
+		CTRACE((tfp, "LSS:%s\n", name ? name : "!?! empty !?!"));
 		if (name != NULL)
 		    parse_style(name);
 	}
@@ -407,7 +407,7 @@ PUBLIC void HStyle_addStyle ARGS1(char*,buffer)
 	if (lss_styles == NULL)
 		lss_styles = HTList_new();
 	strtolower(name);
-	CTRACE(tfp, "READCSS:%s\n", name ? name : "!?! empty !?!");
+	CTRACE((tfp, "READCSS:%s\n", name ? name : "!?! empty !?!"));
 	HTList_addObject (lss_styles, name);
 }
 
@@ -438,14 +438,14 @@ PRIVATE int style_readFromFileREC ARGS2(char*, file, int, toplevel)
     char *buffer = NULL;
     int len;
 
-    CTRACE(tfp, "CSS:Reading styles from file: %s\n", file ? file : "?!? empty ?!?");
+    CTRACE((tfp, "CSS:Reading styles from file: %s\n", file ? file : "?!? empty ?!?"));
     if (file == NULL || *file == '\0')
 	return -1;
     fh = fopen(file, TXT_R);
     if (!fh)
     {
 	/* this should probably be an alert or something */
-	CTRACE(tfp, "CSS:Can't open style file %s, using defaults\n", file);
+	CTRACE((tfp, "CSS:Can't open style file %s, using defaults\n", file));
 	return -1;
     }
 
@@ -508,8 +508,8 @@ PUBLIC void TrimColorClass ARGS3(
 	    *end='\0';
     }
     *phcode = hash_code(lookfrom && *lookfrom ? lookfrom : &tmp[1]);
-    CTRACE(tfp, "CSS:%s (trimmed %s)\n",
-	   (styleclassname ? styleclassname : "<null>"), tmp);
+    CTRACE((tfp, "CSS:%s (trimmed %s)\n",
+	   (styleclassname ? styleclassname : "<null>"), tmp));
 }
 
 /* This function is designed as faster analog to TrimColorClass.
diff --git a/src/LYUpload.c b/src/LYUpload.c
index 3615f613..a6180178 100644
--- a/src/LYUpload.c
+++ b/src/LYUpload.c
@@ -130,7 +130,7 @@ retry:
 	/*
 	 *  See if we can write to it.
 	 */
-	CTRACE(tfp, "LYUpload: filename is %s", buffer);
+	CTRACE((tfp, "LYUpload: filename is %s", buffer));
 
 	if ((fp = fopen(buffer, "w")) != NULL) {
 	    fclose(fp);
@@ -151,7 +151,7 @@ retry:
     HTEndParam(&the_command, SUBDIR_COMMAND, 1);
     StrAllocCat(the_command, the_upload);
 
-    CTRACE(tfp, "command: %s\n", the_command);
+    CTRACE((tfp, "command: %s\n", the_command));
 
     stop_curses();
     LYSystem(the_command);
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 24651c95..a48994fa 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -2130,15 +2130,15 @@ PUBLIC void LYFakeZap ARGS1(
     BOOL,	set)
 {
     if (set && fake_zap < 1) {
-	CTRACE(tfp, "\r *** Set simulated 'Z'");
+	CTRACE((tfp, "\r *** Set simulated 'Z'"));
 	if (fake_zap)
-	    CTRACE(tfp, ", %d pending", fake_zap);
-	CTRACE(tfp, " ***\n");
+	    CTRACE((tfp, ", %d pending", fake_zap));
+	CTRACE((tfp, " ***\n"));
 	fake_zap++;
     } else if (!set && fake_zap) {
-	CTRACE(tfp, "\r *** Unset simulated 'Z'");
-	CTRACE(tfp, ", %d pending", fake_zap);
-	CTRACE(tfp, " ***\n");
+	CTRACE((tfp, "\r *** Unset simulated 'Z'"));
+	CTRACE((tfp, ", %d pending", fake_zap));
+	CTRACE((tfp, " ***\n"));
 	fake_zap = 0;
     }
 
@@ -2185,7 +2185,7 @@ PUBLIC int HTCheckForInterrupt NOARGS
 
     if (fake_zap > 0) {
 	fake_zap--;
-	CTRACE(tfp, "\r *** Got simulated 'Z' ***\n");
+	CTRACE((tfp, "\r *** Got simulated 'Z' ***\n"));
 	CTRACE_FLUSH(tfp);
 	CTRACE_SLEEP(AlertSecs);
 	return((int)TRUE);
@@ -2249,7 +2249,7 @@ PUBLIC int HTCheckForInterrupt NOARGS
 
     if (fake_zap > 0) {
 	fake_zap--;
-	CTRACE(tfp, "\r *** Got simulated 'Z' ***\n");
+	CTRACE((tfp, "\r *** Got simulated 'Z' ***\n"));
 	CTRACE_FLUSH(tfp);
 	CTRACE_SLEEP(AlertSecs);
 	return((int)TRUE);
@@ -2923,7 +2923,7 @@ PUBLIC void LYFixCursesOn ARGS1(
     if (dump_output_immediately || LYCursesON)
 	return;
     if (reason) {
-	CTRACE(tfp, "Forcing curses on to %s\n", reason);
+	CTRACE((tfp, "Forcing curses on to %s\n", reason));
     }
     start_curses();
 }
@@ -3088,7 +3088,7 @@ extern char *ttyname PARAMS((int fd));
 PUBLIC BOOLEAN inlocaldomain NOARGS
 {
 #if ! HAVE_UTMP
-    CTRACE(tfp, "LYUtils: inlocaldomain() not support.\n");
+    CTRACE((tfp, "LYUtils: inlocaldomain() not support.\n"));
     return(TRUE);
 #else
     int n;
@@ -3118,7 +3118,7 @@ PUBLIC BOOLEAN inlocaldomain NOARGS
 #endif /* LINUX */
 
     } else {
-	CTRACE(tfp,"Could not get ttyname or open UTMP file %s\n", UTMP_FILE);
+	CTRACE((tfp,"Could not get ttyname or open UTMP file %s\n", UTMP_FILE));
     }
 
     return(FALSE);
@@ -3194,7 +3194,7 @@ PRIVATE BOOLEAN LYToggleSigDfl ARGS3(
 	rv = sigaction(sig, where, NULL);
     }
     if (rv != 0) {
-	CTRACE(tfp, "Error in LYToggleSigDfl: %s\n", LYStrerror(errno));
+	CTRACE((tfp, "Error in LYToggleSigDfl: %s\n", LYStrerror(errno)));
 	return FALSE;
     } else
 	return TRUE;
@@ -3291,8 +3291,8 @@ PUBLIC void size_change ARGS1(
      */
     if (LYlines != old_lines || LYcols != old_cols) {
 	recent_sizechange = TRUE;
-	CTRACE(tfp, "Window size changed from (%d,%d) to (%d,%d)\n",
-		old_lines, old_cols, LYlines, LYcols);
+	CTRACE((tfp, "Window size changed from (%d,%d) to (%d,%d)\n",
+		old_lines, old_cols, LYlines, LYcols));
     }
 #ifdef SIGWINCH
     LYExtSignal (SIGWINCH, size_change);
@@ -3725,7 +3725,7 @@ PRIVATE int fmt_tempname ARGS3(
 	sprintf(result, "%.*s", LY_MAXPATH-1, leaf);
 	code = FALSE;
     }
-    CTRACE(tfp, "-> '%s'\n", result);
+    CTRACE((tfp, "-> '%s'\n", result));
     return (code);
 }
 
@@ -4209,8 +4209,8 @@ PUBLIC void LYEnsureAbsoluteURL ARGS3(
 	StrAllocCat(*href, "/*");
     }
     if (!is_url(*href)) {
-	CTRACE(tfp, "%s%s'%s' is not a URL\n",
-		    (name ? name : ""), (name ? " " : ""), *href);
+	CTRACE((tfp, "%s%s'%s' is not a URL\n",
+		    (name ? name : ""), (name ? " " : ""), *href));
 	LYConvertToURL(href, fixit);
     }
     if ((temp = HTParse(*href, "", PARSE_ALL)) != NULL && *temp != '\0')
@@ -4349,8 +4349,8 @@ PUBLIC void LYConvertToURL ARGS2(
 		     */
 		    strcpy(url_file, "/");
 		    strcat(url_file, old_string);
-		    CTRACE(tfp, "Can't find '%s'  Will assume it's a bad path.\n",
-				old_string);
+		    CTRACE((tfp, "Can't find '%s'  Will assume it's a bad path.\n",
+				old_string));
 		    StrAllocCat(*AllocatedString, url_file);
 		} else {
 		    /*
@@ -4388,8 +4388,8 @@ PUBLIC void LYConvertToURL ARGS2(
 		 */
 		strcpy(url_file, "/");
 		strcat(url_file, old_string);
-		CTRACE(tfp, "Can't find '%s'  Will assume it's a bad path.\n",
-			    old_string);
+		CTRACE((tfp, "Can't find '%s'  Will assume it's a bad path.\n",
+			    old_string));
 		StrAllocCat(*AllocatedString, url_file);
 	    } else {
 		/*
@@ -4407,7 +4407,7 @@ PUBLIC void LYConvertToURL ARGS2(
 	lib$find_file_end(&context);
 	FREE(cur_dir);
 have_VMS_URL:
-	CTRACE(tfp, "Trying: '%s'\n", *AllocatedString);
+	CTRACE((tfp, "Trying: '%s'\n", *AllocatedString));
 #else /* not VMS: */
 #if defined(DOSPATH)
 #ifdef _WINDOWS
@@ -4422,8 +4422,8 @@ have_VMS_URL:
 		StrAllocCopy(temp, HTDOS_wwwName(fullpath));
 		StrAllocCat(*AllocatedString, temp);
 		FREE(temp);
-		CTRACE(tfp, "Converted '%s' to '%s'\n",
-				old_string, *AllocatedString);
+		CTRACE((tfp, "Converted '%s' to '%s'\n",
+				old_string, *AllocatedString));
 	    } else {
 		StrAllocCat(*AllocatedString, old_string);
 	    }
@@ -4437,8 +4437,8 @@ have_VMS_URL:
 	    StrAllocCopy(temp, wwwName(Current_Dir(curdir)));
 	    StrAllocCat(*AllocatedString, temp);
 	    FREE(temp);
-	    CTRACE(tfp, "Converted '%s' to '%s'\n",
-			old_string, *AllocatedString);
+	    CTRACE((tfp, "Converted '%s' to '%s'\n",
+			old_string, *AllocatedString));
 	}
 #endif
 	else
@@ -4459,8 +4459,8 @@ have_VMS_URL:
 		StrAllocCat(*AllocatedString, temp);
 		FREE(temp);
 	    }
-	    CTRACE(tfp, "Converted '%s' to '%s'\n",
-			old_string, *AllocatedString);
+	    CTRACE((tfp, "Converted '%s' to '%s'\n",
+			old_string, *AllocatedString));
 	} else {
 	    /*
 	     *	Create a full path to the current default directory.
@@ -4499,7 +4499,7 @@ have_VMS_URL:
 	    StrAllocCat(temp, old_string);
 #endif /* DOSPATH */
 	    LYTrimRelFromAbsPath(temp);
-	    CTRACE(tfp, "Converted '%s' to '%s'\n", old_string, temp);
+	    CTRACE((tfp, "Converted '%s' to '%s'\n", old_string, temp));
 	    if ((stat(temp, &st) > -1) ||
 		(fptemp = fopen(temp, "r")) != NULL) {
 		/*
@@ -4519,8 +4519,8 @@ have_VMS_URL:
 #endif /* DOSPATH */
 		StrAllocCat(*AllocatedString, cp);
 		FREE(cp);
-		CTRACE(tfp, "Converted '%s' to '%s'\n",
-			    old_string, *AllocatedString);
+		CTRACE((tfp, "Converted '%s' to '%s'\n",
+			    old_string, *AllocatedString));
 		is_local = TRUE;
 	    } else {
 		char *cp2 = NULL;
@@ -4563,8 +4563,8 @@ have_VMS_URL:
 			}
 		    }
 		    StrAllocCat(*AllocatedString, temp);
-		    CTRACE(tfp, "Converted '%s' to '%s'\n",
-				old_string, *AllocatedString);
+		    CTRACE((tfp, "Converted '%s' to '%s'\n",
+				old_string, *AllocatedString));
 		    is_local = TRUE;
 
 		} else if (strchr(curdir, '#') != NULL ||
@@ -4602,8 +4602,8 @@ have_VMS_URL:
 		 *  local system, so assume it's a URL request and guess
 		 *  the scheme with "http://" as the default.
 		 */
-		CTRACE(tfp, "Can't stat() or fopen() '%s'\n",
-			    temp2 ? temp2 : temp);
+		CTRACE((tfp, "Can't stat() or fopen() '%s'\n",
+			    temp2 ? temp2 : temp));
 #ifdef WIN_EX  /* 1998/01/13 (Tue) 09:07:37 */
 		{
 		    char *p, *q, buff[LY_MAXPATH + 128];
@@ -4639,7 +4639,7 @@ have_VMS_URL:
 #ifdef WIN_EX
 	Retry:
 #endif
-		CTRACE(tfp, "Trying: '%s'\n", *AllocatedString);
+		CTRACE((tfp, "Trying: '%s'\n", *AllocatedString));
 	    }
 	    FREE(temp);
 	    FREE(temp2);
@@ -4671,7 +4671,7 @@ have_VMS_URL:
 	     */
 	    StrAllocCopy(temp, old_string);
 	    LYTrimRelFromAbsPath(temp);
-	    CTRACE(tfp, "Converted '%s' to '%s'\n", old_string, temp);
+	    CTRACE((tfp, "Converted '%s' to '%s'\n", old_string, temp));
 	    cp = HTEscape(temp, URL_PATH);
 	    StrAllocCat(*AllocatedString, cp);
 	    FREE(cp);
@@ -4680,8 +4680,8 @@ have_VMS_URL:
 		fclose(fptemp);
 		fptemp = NULL;
 	    }
-	    CTRACE(tfp, "Converted '%s' to '%s'\n",
-			old_string, *AllocatedString);
+	    CTRACE((tfp, "Converted '%s' to '%s'\n",
+			old_string, *AllocatedString));
 #endif /* VMS */
 	} else if (old_string[1] == '~') {
 	    /*
@@ -4710,8 +4710,8 @@ have_VMS_URL:
 	    StrAllocCat(*AllocatedString, temp);
 	    FREE(temp);
 	}
-	CTRACE(tfp, "Converted '%s' to '%s'\n",
-		    old_string, *AllocatedString);
+	CTRACE((tfp, "Converted '%s' to '%s'\n",
+		    old_string, *AllocatedString));
     }
     FREE(old_string);
     /* Pause so we can read the messages before invoking curses */
@@ -4864,9 +4864,9 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
 	 *  Clear any residual interrupt. - FM
 	 */
 	if (LYCursesON && HTCheckForInterrupt()) {
-	    CTRACE(tfp,
+	    CTRACE((tfp,
 	    "LYExpandHostForURL: Ignoring interrupt because '%s' resolved.\n",
-			host);
+			host));
 	}
 
 	/*
@@ -4887,9 +4887,9 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
 	/*
 	 *  Give the user chance to interrupt lookup cycles. - KW & FM
 	 */
-	CTRACE(tfp,
+	CTRACE((tfp,
 	"LYExpandHostForURL: Interrupted while '%s' failed to resolve.\n",
-		    host);
+		    host));
 
 	/*
 	 *  Return failure. - FM
@@ -4993,9 +4993,9 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
 		if (LYCursesON && (lynx_nsl_status == HT_INTERRUPTED))
 #endif
 		{
-		    CTRACE(tfp,
+		    CTRACE((tfp,
 	"LYExpandHostForURL: Interrupted while '%s' failed to resolve.\n",
-				host);
+				host));
 		    FREE(Str);
 		    FREE(MsgStr);
 		    FREE(Host);
@@ -5060,9 +5060,9 @@ PUBLIC BOOLEAN LYExpandHostForURL ARGS3(
      *	Clear any residual interrupt. - FM
      */
     if (LYCursesON && HTCheckForInterrupt()) {
-	CTRACE(tfp, "LYExpandHostForURL: Ignoring interrupt because '%s' %s.\n",
+	CTRACE((tfp, "LYExpandHostForURL: Ignoring interrupt because '%s' %s.\n",
 		    host,
-		    (GotHost ? "resolved" : "timed out"));
+		    (GotHost ? "resolved" : "timed out")));
     }
 
     /*
@@ -5760,7 +5760,7 @@ PUBLIC time_t LYmktime ARGS2(
     if (!(string && *string))
 	return(0);
     s = string;
-    CTRACE(tfp, "LYmktime: Parsing '%s'\n", s);
+    CTRACE((tfp, "LYmktime: Parsing '%s'\n", s));
 
     /*
      *	Skip any lead alphabetic "Day, " field and
@@ -5977,9 +5977,9 @@ PUBLIC time_t LYmktime ARGS2(
     if (absolute == FALSE && clock2 <= time(NULL))
 	clock2 = (time_t)0;
     if (clock2 > 0)
-	CTRACE(tfp, "LYmktime: clock=%ld, ctime=%s",
+	CTRACE((tfp, "LYmktime: clock=%ld, ctime=%s",
 		    (long) clock2,
-		    ctime(&clock2));
+		    ctime(&clock2)));
 
     return(clock2);
 }
@@ -6324,7 +6324,7 @@ PUBLIC FILE *LYOpenTemp ARGS3(
     BOOL wrt = 'r';
     LY_TEMP *p;
 
-    CTRACE(tfp, "LYOpenTemp(,%s,%s)\n", suffix, mode);
+    CTRACE((tfp, "LYOpenTemp(,%s,%s)\n", suffix, mode));
     if (result == 0)
 	return 0;
 
@@ -6334,7 +6334,7 @@ PUBLIC FILE *LYOpenTemp ARGS3(
 	case 'a':	wrt = 'a';	break;
 	case 'b':	txt = FALSE;	break;
 	default:
-		CTRACE(tfp, "%s @%d: BUG\n", __FILE__, __LINE__);
+		CTRACE((tfp, "%s @%d: BUG\n", __FILE__, __LINE__));
 		return fp;
 	}
     }
@@ -6361,8 +6361,8 @@ PUBLIC FILE *LYOpenTemp ARGS3(
 	 */
 #ifdef EEXIST	/* FIXME (need a better test) in fcntl.h or unistd.h */
 	if ((fp == 0) && (errno != EEXIST)) {
-	    CTRACE(tfp, "... LYOpenTemp(%s) failed: %s\n",
-		   result, LYStrerror(errno));
+	    CTRACE((tfp, "... LYOpenTemp(%s) failed: %s\n",
+		   result, LYStrerror(errno)));
 	    return 0;
 	}
 #endif
@@ -6377,7 +6377,7 @@ PUBLIC FILE *LYOpenTemp ARGS3(
 	outofmem(__FILE__, "LYOpenTemp");
     }
 
-    CTRACE(tfp, "... LYOpenTemp(%s)\n", result);
+    CTRACE((tfp, "... LYOpenTemp(%s)\n", result));
     return fp;
 }
 
@@ -6430,7 +6430,7 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
     LY_TEMP *p;
     struct stat stat_buf;
 
-    CTRACE(tfp, "LYOpenTempRewrite(%s,%s,%s)\n", fname, suffix, mode);
+    CTRACE((tfp, "LYOpenTempRewrite(%s,%s,%s)\n", fname, suffix, mode));
     if (*fname == '\0')		/* first time, no filename yet */
 	return (LYOpenTemp(fname, suffix, mode));
 
@@ -6439,8 +6439,8 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
 	    registered = YES;
 	    if (p->file != 0)
 		still_open = YES;
-	    CTRACE(tfp, "...used before%s\n",
-		still_open ? ", still open!" : ".");
+	    CTRACE((tfp, "...used before%s\n",
+		still_open ? ", still open!" : "."));
 	    break;
 	}
     }
@@ -6448,8 +6448,10 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
     if (registered) {
 #ifndef NO_GROUPS
 	writable_exists = HTEditable(fname); /* existing, can write */
+#define CTRACE_EXISTS "exists and is writable"
 #else
 	writable_exists = (BOOL) (stat(fname, &stat_buf) == 0); /* existing, assume can write */
+#define CTRACE_EXISTS "exists"
 #endif
 
 	if (writable_exists) {
@@ -6459,15 +6461,9 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
 	    is_ours = TRUE;	/* assume ok, if we get to here */
 #endif
 	}
-	CTRACE(tfp, "...%s%s\n",
-	       writable_exists ?
-#ifndef NO_GROUPS
-	       "exists and is writable, "
-#else
-	       "exists, "
-#endif
-	       : "",
-	       is_ours ? "is our file." : "is NOT our file.");
+	CTRACE((tfp, "...%s%s\n",
+	       writable_exists ? CTRACE_EXISTS : "",
+	       is_ours ? "is our file." : "is NOT our file."));
     }
 
     /*
@@ -6491,8 +6487,8 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
 	 */
 #if HAVE_TRUNCATE
 	if (truncate(fname, 0) != 0) {
-	    CTRACE(tfp, "... truncate(%s,0) failed: %s\n",
-		   fname, LYStrerror(errno));
+	    CTRACE((tfp, "... truncate(%s,0) failed: %s\n",
+		   fname, LYStrerror(errno)));
 	    return (LYOpenTemp(fname, suffix, mode));
 	}
 #endif
@@ -6530,7 +6526,7 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
 	case 'a':	wrt = 'a';	break;
 	case 'b':	txt = FALSE;	break;
 	default:
-		CTRACE(tfp, "%s @%d: BUG\n", __FILE__, __LINE__);
+		CTRACE((tfp, "%s @%d: BUG\n", __FILE__, __LINE__));
 		return fp;
 	}
     }
@@ -6549,8 +6545,8 @@ PUBLIC FILE *LYOpenTempRewrite ARGS3(
     }
     p->file = fp;
 
-    CTRACE(tfp, "... LYOpenTempRewrite(%s), %s\n", fname,
-	   (fp) ? "ok" : "failed");
+    CTRACE((tfp, "... LYOpenTempRewrite(%s), %s\n", fname,
+	   (fp) ? "ok" : "failed"));
     /*
      *  We could fall back to trying LYOpenTemp() here in case of failure.
      *  After all the checks already done above a filure here should be
@@ -6584,7 +6580,7 @@ PUBLIC FILE *LYOpenScratch ARGS2(
 	    outofmem(__FILE__, "LYOpenScratch");
 	}
     }
-    CTRACE(tfp, "LYOpenScratch(%s)\n", result);
+    CTRACE((tfp, "LYOpenScratch(%s)\n", result));
     return fp;
 }
 
@@ -6596,11 +6592,11 @@ PUBLIC void LYCloseTemp ARGS1(
 {
     LY_TEMP *p;
 
-    CTRACE(tfp, "LYCloseTemp(%s)\n", name);
+    CTRACE((tfp, "LYCloseTemp(%s)\n", name));
     for (p = ly_temp; p != 0; p = p->next) {
 	if (!strcmp(name, p->name)) {
-	    CTRACE(tfp, "...LYCloseTemp(%s)%s\n", name,
-		(p->file != 0) ? ", closed" : "");
+	    CTRACE((tfp, "...LYCloseTemp(%s)%s\n", name,
+		(p->file != 0) ? ", closed" : ""));
 	    if (p->file != 0) {
 		fclose(p->file);
 		p->file = 0;
@@ -6618,12 +6614,12 @@ PUBLIC void LYCloseTempFP ARGS1(
 {
     LY_TEMP *p;
 
-    CTRACE(tfp, "LYCloseTempFP\n");
+    CTRACE((tfp, "LYCloseTempFP\n"));
     for (p = ly_temp; p != 0; p = p->next) {
 	if (p->file == fp) {
 	    fclose(p->file);
 	    p->file = 0;
-	    CTRACE(tfp, "...LYCloseTempFP(%s)\n", p->name);
+	    CTRACE((tfp, "...LYCloseTempFP(%s)\n", p->name));
 	    break;
 	}
     }
@@ -6639,7 +6635,7 @@ PUBLIC void LYRemoveTemp ARGS1(
     int code;
 
     if (name != 0 && *name != 0) {
-	CTRACE(tfp, "LYRemoveTemp(%s)\n", name);
+	CTRACE((tfp, "LYRemoveTemp(%s)\n", name));
 	for (p = ly_temp, q = 0; p != 0; q = p, p = p->next) {
 	    if (!strcmp(name, p->name)) {
 		if (q != 0) {
@@ -6650,8 +6646,8 @@ PUBLIC void LYRemoveTemp ARGS1(
 		if (p->file != 0)
 		    fclose(p->file);
 		code = HTSYS_remove(name);
-		CTRACE(tfp, "...LYRemoveTemp done(%d)%s\n", code,
-		       (p->file != 0) ? ", closed" : "");
+		CTRACE((tfp, "...LYRemoveTemp done(%d)%s\n", code,
+		       (p->file != 0) ? ", closed" : ""));
 		CTRACE_FLUSH(tfp);
 		FREE(p->name);
 		FREE(p);
@@ -6681,7 +6677,7 @@ PUBLIC void LYRenamedTemp ARGS2(
 {
     LY_TEMP *p;
 
-    CTRACE(tfp, "LYRenamedTemp(old=%s, new=%s)\n", oldname, newname);
+    CTRACE((tfp, "LYRenamedTemp(old=%s, new=%s)\n", oldname, newname));
     for (p = ly_temp; p != 0; p = p->next) {
 	if (!strcmp(oldname, p->name)) {
 	    StrAllocCopy((p->name), newname);
@@ -7086,7 +7082,7 @@ PUBLIC int LYCopyFile ARGS2(
     HTAddParam(&the_command, COPY_COMMAND, 3, dst);
     HTEndParam(&the_command, COPY_COMMAND, 3);
 
-    CTRACE(tfp, "command: %s\n", the_command);
+    CTRACE((tfp, "command: %s\n", the_command));
     stop_curses();
     code = LYSystem(the_command);
     start_curses();
@@ -7112,7 +7108,7 @@ PUBLIC int LYSystem ARGS1(
 
     fflush(stdout);
     fflush(stderr);
-    CTRACE(tfp, "LYSystem(%s)\n", command);
+    CTRACE((tfp, "LYSystem(%s)\n", command));
     CTRACE_FLUSH(tfp);
 
 #ifdef __DJGPP__
@@ -7601,7 +7597,7 @@ PUBLIC void LYSyslog ARGS1(
     char *colon2;
     char *atsign;
 
-    CTRACE(tfp, "LYSyslog %s\n", arg);
+    CTRACE((tfp, "LYSyslog %s\n", arg));
 
     if (is_url(arg)) {	/* proto://user:password@host/path:port */
 			/*	^this colon		    */
@@ -7618,7 +7614,7 @@ PUBLIC void LYSyslog ARGS1(
 	    StrAllocCat(buf, "******");
 	    StrAllocCat(buf, atsign);
 	    syslog (LOG_INFO|LOG_LOCAL5, buf);
-	    CTRACE(tfp, "...alter %s\n", buf);
+	    CTRACE((tfp, "...alter %s\n", buf));
 	    FREE(buf);
 	    return;
         }
diff --git a/src/LYexit.c b/src/LYexit.c
index 3fd90cac..71079a12 100644
--- a/src/LYexit.c
+++ b/src/LYexit.c
@@ -44,7 +44,7 @@ void (*function)();
      *  Check for available space.
      */
     if (topOfStack == ATEXITSIZE) {
-	CTRACE(tfp, "(LY)atexit: Too many functions, ignoring one!\n");
+	CTRACE((tfp, "(LY)atexit: Too many functions, ignoring one!\n"));
 	return(-1);
     }
 
diff --git a/src/UCAuto.c b/src/UCAuto.c
index 6446341d..9b4fc7f3 100644
--- a/src/UCAuto.c
+++ b/src/UCAuto.c
@@ -77,7 +77,7 @@ PRIVATE void call_setfont ARGS3(
     }
 
     if (T_setfont_cmd) {
-	CTRACE(tfp, "Executing setfont: '%s'\n", T_setfont_cmd);
+	CTRACE((tfp, "Executing setfont: '%s'\n", T_setfont_cmd));
 	LYSystem(T_setfont_cmd);
 	FREE(T_setfont_cmd);
     }
@@ -145,7 +145,7 @@ PUBLIC void UCChangeTerminalCodepage ARGS2(
 		    HTSprintf0(&tmpbuf1, "%s %s %s",
 			    SETFONT, old_font, NOOUTPUT);
 		}
-		CTRACE(tfp, "Executing setfont to restore: '%s'\n", tmpbuf1);
+		CTRACE((tfp, "Executing setfont to restore: '%s'\n", tmpbuf1));
 		LYSystem(tmpbuf1);
 		FREE(tmpbuf1);
 	    }
@@ -177,7 +177,7 @@ PUBLIC void UCChangeTerminalCodepage ARGS2(
 	    char *rp;
 	    HTSprintf0(&tmpbuf1, "%s -o %s -ou %s %s",
 		       SETFONT, old_font, old_umap, NOOUTPUT);
-	    CTRACE(tfp, "Executing setfont to save: '%s'\n", tmpbuf1);
+	    CTRACE((tfp, "Executing setfont to save: '%s'\n", tmpbuf1));
 	    LYSystem(tmpbuf1);
 	    FREE(tmpbuf1);
 	    LYCloseTempFP(fp1);
@@ -371,10 +371,10 @@ PUBLIC void UCChangeTerminalCodepage ARGS2(
 
     if (p->codepage) {
 	res = VioSetCp(0, p->codepage, 0);
-	CTRACE(tfp, "UCChangeTerminalCodepage: VioSetCp(%d) returned %d\n", p->codepage, res);
+	CTRACE((tfp, "UCChangeTerminalCodepage: VioSetCp(%d) returned %d\n", p->codepage, res));
     }
 #else
-    CTRACE(tfp, "UCChangeTerminalCodepage: Called, but not implemented!");
+    CTRACE((tfp, "UCChangeTerminalCodepage: Called, but not implemented!"));
 #endif
 }
 #endif /* LINUX */
@@ -387,6 +387,6 @@ PUBLIC void UCChangeTerminalCodepage ARGS2(
 	int,		newcs GCC_UNUSED,
 	LYUCcharset *,	p GCC_UNUSED)
 {
-    CTRACE(tfp, "UCChangeTerminalCodepage: Called, but not implemented!");
+    CTRACE((tfp, "UCChangeTerminalCodepage: Called, but not implemented!"));
 }
 #endif /* EXP_CHARTRANS_AUTOSWITCH */
diff --git a/src/UCAux.c b/src/UCAux.c
index dd8e9cb3..eaab7522 100644
--- a/src/UCAux.c
+++ b/src/UCAux.c
@@ -157,10 +157,9 @@ PUBLIC void UCSetTransParams ARGS5(
     int,		cs_out,
     CONST LYUCcharset*,	p_out)
 {
-    CTRACE(tfp, "UCSetTransParams: from %s(%d) to %s(%d)\n",
-/*	   p_in->MIMEname, p_in->UChndl, p_out->MIMEname, p_out->UChndl); */
+    CTRACE((tfp, "UCSetTransParams: from %s(%d) to %s(%d)\n",
 	   p_in->MIMEname,  UCGetLYhndl_byMIME(p_in->MIMEname),
-	   p_out->MIMEname, UCGetLYhndl_byMIME(p_out->MIMEname));
+	   p_out->MIMEname, UCGetLYhndl_byMIME(p_out->MIMEname)));
 
     /*
     **  Initialize this element to FALSE, and set it TRUE
diff --git a/src/UCdomap.c b/src/UCdomap.c
index 35e3e027..38dbf6f5 100644
--- a/src/UCdomap.c
+++ b/src/UCdomap.c
@@ -479,8 +479,8 @@ PRIVATE void UC_con_set_trans ARGS3(
     u16 *ptrans;
 
     if (!UC_valid_UC_charset(UC_charset_in_hndl)) {
-	CTRACE(tfp, "UC_con_set_trans: Invalid charset handle %d.\n",
-		    UC_charset_in_hndl);
+	CTRACE((tfp, "UC_con_set_trans: Invalid charset handle %d.\n",
+		    UC_charset_in_hndl));
 	return;
     }
     ptrans = translations[Gn];
@@ -800,8 +800,8 @@ PRIVATE int UC_con_set_unimap ARGS2(
     CONST u16 *p;
 
     if (!UC_valid_UC_charset(UC_charset_out_hndl)) {
-	CTRACE(tfp, "UC_con_set_unimap: Invalid charset handle %d.\n",
-		    UC_charset_out_hndl);
+	CTRACE((tfp, "UC_con_set_unimap: Invalid charset handle %d.\n",
+		    UC_charset_out_hndl));
 	return -1;
     }
 
@@ -1207,8 +1207,8 @@ PRIVATE int UC_MapGN ARGS2(
 	UCInfo[UChndl].GN = Gn;
 	UC_GNhandles[Gn] = UChndl;
     }
-    CTRACE(tfp, "UC_MapGN: Using %d <- %d (%s)\n",
-		Gn, UChndl, UCInfo[UChndl].MIMEname);
+    CTRACE((tfp, "UC_MapGN: Using %d <- %d (%s)\n",
+		Gn, UChndl, UCInfo[UChndl].MIMEname));
     UC_con_set_trans(UChndl,Gn,update_flag);
     return Gn;
 }
@@ -1555,7 +1555,7 @@ PUBLIC int UCGetLYhndl_byMIME ARGS1(
     int LYhndl = -1;
 
     if (!value || !(*value)) {
-	CTRACE(tfp, "UCGetLYhndl_byMIME: NULL argument instead of MIME name.\n");
+	CTRACE((tfp, "UCGetLYhndl_byMIME: NULL argument instead of MIME name.\n"));
 	return -1;
     }
 
@@ -1677,7 +1677,7 @@ PUBLIC int UCGetLYhndl_byMIME ARGS1(
 #endif
     /* no more synonyms if come here... */
 
-    CTRACE(tfp, "UCGetLYhndl_byMIME: unrecognized MIME name \"%s\"\n", value);
+    CTRACE((tfp, "UCGetLYhndl_byMIME: unrecognized MIME name \"%s\"\n", value));
     return -1;	/* returns -1 if no charset found by that MIME name */
 }
 
@@ -1915,8 +1915,8 @@ PRIVATE int UC_Register_with_LYCharSets ARGS4(
     if (LYhndl < 0) {		/* not found */
 	found = 0;
 	if (LYNumCharsets >= MAXCHARSETS) {
-	    CTRACE(tfp, "UC_Register_with_LYCharSets: Too many.  Ignoring %s/%s.",
-			UC_MIMEcharset, UC_LYNXcharset);
+	    CTRACE((tfp, "UC_Register_with_LYCharSets: Too many.  Ignoring %s/%s.",
+			UC_MIMEcharset, UC_LYNXcharset));
 	    return -1;
 	}
 	/*
@@ -2000,8 +2000,8 @@ PUBLIC void UC_Charset_Setup ARGS9(
 	s = found;
     } else {
 	if (UCNumCharsets >= MAXCHARSETS) {
-	    CTRACE(tfp, "UC_Charset_Setup: Too many.  Ignoring %s/%s.",
-			UC_MIMEcharset, UC_LYNXcharset);
+	    CTRACE((tfp, "UC_Charset_Setup: Too many.  Ignoring %s/%s.",
+			UC_MIMEcharset, UC_LYNXcharset));
 	    return;
 	}
 	s = UCNumCharsets;
@@ -2073,8 +2073,8 @@ PRIVATE int UC_NoUctb_Register_with_LYCharSets ARGS5(
 
     /* not found */
     if (LYNumCharsets >= MAXCHARSETS) {
-	CTRACE(tfp, "UC_NoUctb_Register_with_LYCharSets: Too many.  Ignoring %s/%s.",
-	       UC_MIMEcharset, UC_LYNXcharset);
+	CTRACE((tfp, "UC_NoUctb_Register_with_LYCharSets: Too many.  Ignoring %s/%s.",
+	       UC_MIMEcharset, UC_LYNXcharset));
 	return -1;
     }
     /*
@@ -2251,7 +2251,7 @@ PUBLIC int safeUCGetLYhndl_byMIME ARGS1 (CONST char *, value)
 
     if (i == -1) {	/* was user's typo or not yet recognized value */
 	i = LATIN1;	/* error recovery? */
-	CTRACE(tfp, "safeUCGetLYhndl_byMIME: ISO-8859-1 assumed.\n");
+	CTRACE((tfp, "safeUCGetLYhndl_byMIME: ISO-8859-1 assumed.\n"));
     }
 
     return(i);
diff --git a/src/structdump.h b/src/structdump.h
index 90b4a807..cc191ade 100644
--- a/src/structdump.h
+++ b/src/structdump.h
@@ -9,7 +9,7 @@
 /* usage: DUMPSTRUCT_LINK(link_ptr, "message"); */
 #define   DUMPSTRUCT_LINK(L,X) \
 if ((L)) { \
-CTRACE(tfp, "\n" \
+CTRACE((tfp, "\n" \
             "KED:     link_ptr=0x%08x  sizeof=%d  ["X"]\n" \
             "link       struct {\n"      \
             "           *lname=0x%08x\n" \
@@ -33,10 +33,10 @@ CTRACE(tfp, "\n" \
             (L)->lname, (L)->lname, (L)->target, (L)->target, \
             (L)->hightext, (L)->hightext, (L)->hightext2, (L)->hightext2, \
             (L)->hightext2_offset, (L)->inUnderline, (L)->lx, (L)->ly, \
-            (L)->type, (L)->anchor_number, (L)->anchor_line_num, (L)->form); \
+            (L)->type, (L)->anchor_number, (L)->anchor_line_num, (L)->form)); \
 }else{ \
-CTRACE(tfp, "\n" \
-            "KED:     link_ptr=0x00000000  (NULL)     ["X"]\n"); \
+CTRACE((tfp, "\n" \
+            "KED:     link_ptr=0x00000000  (NULL)     ["X"]\n")); \
 } \
 CTRACE_FLUSH(tfp);
 
@@ -44,7 +44,7 @@ CTRACE_FLUSH(tfp);
 /* usage: DUMPSTRUCT_ANCHOR(anchor_ptr, "message"); */
 #define   DUMPSTRUCT_ANCHOR(A,X) \
 if ((A)) { \
-CTRACE(tfp, "\n" \
+CTRACE((tfp, "\n" \
             "KED:   anchor_ptr=0x%08x  sizeof=%d  ["X"]\n" \
             "TextAnchor struct {\n"      \
             "            *next=0x%08x\n" \
@@ -72,10 +72,10 @@ CTRACE(tfp, "\n" \
             (A)->hightext, (A)->hightext, (A)->hightext2, (A)->hightext2, \
             (A)->hightext2offset, (A)->link_type, \
             (A)->input_field, (A)->input_field, (A)->show_anchor, \
-            (A)->inUnderline, (A)->expansion_anch, (A)->anchor); \
+            (A)->inUnderline, (A)->expansion_anch, (A)->anchor)); \
 }else{ \
-CTRACE(tfp, "\n" \
-            "KED:   anchor_ptr=0x00000000  (NULL)     ["X"]\n"); \
+CTRACE((tfp, "\n" \
+            "KED:   anchor_ptr=0x00000000  (NULL)     ["X"]\n")); \
 } \
 CTRACE_FLUSH(tfp);
 
@@ -83,7 +83,7 @@ CTRACE_FLUSH(tfp);
 /* usage: DUMPSTRUCT_FORM(forminfo_ptr, "message"); */
 #define   DUMPSTRUCT_FORMINFO(F,X) \
 if ((F)) { \
-CTRACE(tfp, "\n" \
+CTRACE((tfp, "\n" \
             "KED: forminfo_ptr=0x%08x  sizeof=%d  ["X"]\n" \
             "FormInfo   struct {\n"      \
             "            *name=0x%08x\n" \
@@ -122,10 +122,10 @@ CTRACE(tfp, "\n" \
             (F)->submit_method, (F)->submit_enctype, (F)->submit_title, \
             (F)->no_cache, (F)->cp_submit_value, (F)->orig_submit_value, \
             (F)->size_l, (F)->disabled, (F)->name_cs, (F)->value_cs, \
-            (F)->accept_cs); \
-}else{ \
-CTRACE(tfp, "\n" \
-            "KED: forminfo_ptr=0x00000000  (NULL)     ["X"]\n"); \
+            (F)->accept_cs)); \
+} else { \
+CTRACE((tfp, "\n" \
+            "KED: forminfo_ptr=0x00000000  (NULL)     ["X"]\n")); \
 } \
 CTRACE_FLUSH(tfp);
 
@@ -133,7 +133,7 @@ CTRACE_FLUSH(tfp);
 /* usage: DUMPSTRUCT_LINE(htline_ptr, "message"); */
 #define   DUMPSTRUCT_LINE(L,X) \
 if ((L)) { \
-CTRACE(tfp, "\n" \
+CTRACE((tfp, "\n" \
             "KED: htline_ptr=0x%08x  sizeof=%d  ["X"]\n" \
             "HTLine  struct {\n"      \
             "         *next=0x%08x\n" \
@@ -149,10 +149,10 @@ CTRACE(tfp, "\n" \
             "}\n", \
             (L), sizeof(*((L))), \
             (L)->next, (L)->prev, (L)->offset, (L)->size, (L)->split_after, \
-            (L)->bullet, (L)->expansion_line, (L)->data, (L)->data); \
+            (L)->bullet, (L)->expansion_line, (L)->data, (L)->data)); \
 }else{ \
-CTRACE(tfp, "\n" \
-            "KED: htline_ptr=0x00000000  (NULL)     ["X"]\n"); \
+CTRACE((tfp, "\n" \
+            "KED: htline_ptr=0x00000000  (NULL)     ["X"]\n")); \
 } \
 CTRACE_FLUSH(tfp);