Index: edif.c
===================================================================
--- edif.c	(revision 13665)
+++ edif.c	(revision 13666)
@@ -5650,7 +5650,7 @@
       }
       break;
     }
-  return (wlk);
+  return wlk;
 }
 /*
  *	Context hash table.
@@ -5683,7 +5683,7 @@
       }
       break;
     }
-  return (wlk);
+  return wlk;
 }
 /*
  *	Token stacking variables.
@@ -5987,7 +5987,7 @@
       }
       return (wlk->Token->Code);
     }
-  return (0);
+  return 0;
 }
 /*
  *	Match context:
@@ -6039,7 +6039,7 @@
       owk->u.Used = NULL;
       return (wlk->Context->Code);
     }
-  return (0);
+  return 0;
 }
 /*
  *	PopC:
@@ -6126,7 +6126,7 @@
         else {
           yytext[1] = '\0';
           Stack(yytext,c);
-          return (c);
+          return c;
         }
         break;
       /*
@@ -6139,7 +6139,7 @@
         yytext[--l] = '\0';
         yylval.s = strcpy((char *)Malloc(l + 1),yytext);
         Stack(yytext,EDIF_TOK_INT);
-        return (EDIF_TOK_INT);
+        return EDIF_TOK_INT;
       /*
        *	Grab an identifier, see if the current context enables
        *	it with a specific token value.
@@ -6151,11 +6151,11 @@
         yytext[--l] = '\0';
         if (CSP->Context->Token && (c = MatchToken(yytext))){
           Stack(yytext,c);
-          return (c);
+          return c;
         }
         yylval.s = strcpy((char *)Malloc(l + 1),yytext);
         Stack(yytext, EDIF_TOK_IDENT);
-        return (EDIF_TOK_IDENT);
+        return EDIF_TOK_IDENT;
       /*
        *	Scan until you find the start of an identifier, discard
        *	any whitespace found. On no identifier, return a '('.
@@ -6183,11 +6183,11 @@
         yytext[--l] = '\0';
         if ( (c = MatchContext(yytext)) ){
           Stack(yytext,c);
-          return (c);
+          return c;
         }
         yylval.s = strcpy((char *)Malloc(l + 1),yytext);
         Stack(yytext, EDIF_TOK_KEYWORD);
-        return (EDIF_TOK_KEYWORD);
+        return EDIF_TOK_KEYWORD;
       /*
        *	Suck up string characters but once resolved they should
        *	be deposited in the string bucket because they can be
@@ -6201,7 +6201,7 @@
         else if (c == '"' || c == EOF){
           yylval.s = FormString();
           Stack(yylval.s, EDIF_TOK_STR);
-          return (EDIF_TOK_STR);
+          return EDIF_TOK_STR;
         } else if (c == '%')
           s = L_ASCIICHAR;
         else
Index: edif.y
===================================================================
--- edif.y	(revision 13665)
+++ edif.y	(revision 13666)
@@ -3862,7 +3862,7 @@
       }
       break;
     }
-  return (wlk);
+  return wlk;
 }
 /*
  *	Context hash table.
@@ -3895,7 +3895,7 @@
       }
       break;
     }
-  return (wlk);
+  return wlk;
 }
 /*
  *	Token stacking variables.
@@ -4199,7 +4199,7 @@
       }
       return (wlk->Token->Code);
     }
-  return (0);
+  return 0;
 }
 /*
  *	Match context:
@@ -4251,7 +4251,7 @@
       owk->u.Used = NULL;
       return (wlk->Context->Code);
     }
-  return (0);
+  return 0;
 }
 /*
  *	PopC:
@@ -4338,7 +4338,7 @@
         else {
           yytext[1] = '\0';
           Stack(yytext,c);
-          return (c);
+          return c;
         }
         break;
       /*
@@ -4351,7 +4351,7 @@
         yytext[--l] = '\0';
         yylval.s = strcpy((char *)Malloc(l + 1),yytext);
         Stack(yytext,EDIF_TOK_INT);
-        return (EDIF_TOK_INT);
+        return EDIF_TOK_INT;
       /*
        *	Grab an identifier, see if the current context enables
        *	it with a specific token value.
@@ -4363,11 +4363,11 @@
         yytext[--l] = '\0';
         if (CSP->Context->Token && (c = MatchToken(yytext))){
           Stack(yytext,c);
-          return (c);
+          return c;
         }
         yylval.s = strcpy((char *)Malloc(l + 1),yytext);
         Stack(yytext, EDIF_TOK_IDENT);
-        return (EDIF_TOK_IDENT);
+        return EDIF_TOK_IDENT;
       /*
        *	Scan until you find the start of an identifier, discard
        *	any whitespace found. On no identifier, return a '('.
@@ -4395,11 +4395,11 @@
         yytext[--l] = '\0';
         if ( (c = MatchContext(yytext)) ){
           Stack(yytext,c);
-          return (c);
+          return c;
         }
         yylval.s = strcpy((char *)Malloc(l + 1),yytext);
         Stack(yytext, EDIF_TOK_KEYWORD);
-        return (EDIF_TOK_KEYWORD);
+        return EDIF_TOK_KEYWORD;
       /*
        *	Suck up string characters but once resolved they should
        *	be deposited in the string bucket because they can be
@@ -4413,7 +4413,7 @@
         else if (c == '"' || c == EOF){
           yylval.s = FormString();
           Stack(yylval.s, EDIF_TOK_STR);
-          return (EDIF_TOK_STR);
+          return EDIF_TOK_STR;
         } else if (c == '%')
           s = L_ASCIICHAR;
         else