Update to xkbcomp 1.4.5

36 files changed, 847 insertions, 805 deletions

diff --git a/app/xkbcomp/COPYING b/app/xkbcomp/COPYING
index fc22e80e8..105e0a424 100644
--- a/app/xkbcomp/COPYING
+++ b/app/xkbcomp/COPYING
@@ -5,19 +5,19 @@ software and its documentation for any purpose and without
 fee is hereby granted, provided that the above copyright
 notice appear in all copies and that both that copyright
 notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be 
-used in advertising or publicity pertaining to distribution 
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
 of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability 
+Silicon Graphics makes no representation about the suitability
 of this software for any purpose. It is provided "as is"
 without any express or implied warranty.
 
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
 AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
 OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -49,13 +49,13 @@ Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -73,8 +73,8 @@ SOFTWARE.
 
 THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
 SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
-DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE 
-FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED 
+DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
 WARRANTY.
 
 IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -86,5 +86,5 @@ documentation for any purpose and without fee is hereby granted, provided
 that the above copyright notice appear in all copies and that both that
 copyright notice and this permission notice appear in supporting
 documentation, and that the name of Digital Equipment Corporation not be
-used in advertising or publicity pertaining to distribution of the 
+used in advertising or publicity pertaining to distribution of the
 software without specific, written prior permission.
diff --git a/app/xkbcomp/ChangeLog b/app/xkbcomp/ChangeLog
index 85390dde8..a4c525b7a 100644
--- a/app/xkbcomp/ChangeLog
+++ b/app/xkbcomp/ChangeLog
@@ -1,3 +1,86 @@
+commit f8b240e897ed68b90c116ce4c2f8814e71e5aa97
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Wed Mar 17 15:39:53 2021 +1000
+
+    xkbcomp 1.4.5
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit da810f10d732a312ccee88652141c1d165efc114
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jan 21 13:24:00 2021 +1000
+
+    keycodes: compress the high keycode warning
+    
+    No point spending 3 lines on this, especially given that this warning is
+    always triggered.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 80398db098b2a2214c5bef28d09cefd58beac43d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jan 21 13:20:40 2021 +1000
+
+    keycodes: downgrade the >255 keycode warning to an info
+    
+    This warning will be triggered all the time now that xkeyboard-config has
+    started adding keycodes > 255. Downgrade to an info, there's nothing the user
+    can do about this warning anyway.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 1955a2645670eeea83d6d163653749249cd839f2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jan 21 13:16:53 2021 +1000
+
+    Downgrade the warning for missing symbols to info
+    
+    In the interest of maintainability, it's easier to include as many keycodes as
+    possible and then have the symbols mapping specific to the layout. This is
+    particularly true for evdev where the kernel takes care of device-specifics
+    and every keyboard has the same set of keycodes anyway.
+    
+    So let's downgrade this from a warning to a mere info, virtually every
+    keyboard right now triggers this warning for a number of keys.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 9510dedad875099c32993246188050ea73ab1a9f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jan 21 13:08:25 2021 +1000
+
+    Replace WARN[1-9], ERROR[1-9], etc. with their unnumbered version
+    
+    Those macros date back to when varargs weren't a thing but they've
+    been #defined to the same value for 17 years now.
+    
+    Patch generated with:
+            for action in WARN INFO ERROR ACTION FATAL WSGO; do
+            sed -i "s/${action}[1-9]/${action}/g" `git ls-files`
+            done
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit ff6a19ed8898ee8c79b2b2a2f87806353d89f5d4
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jan 21 13:46:01 2021 +1000
+
+    gitlab CI: add basic build test
+    
+    Copied from xorgproto
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 3b3d25dd32ba48fd6d15ca98baf7109af21e1d97
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Jan 21 13:24:51 2021 +1000
+
+    Remove trailing whitespaces
+    
+    Let's clean this up so I don't have to fight vim and git in removing them.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
 commit 790b998647ec171133bf196a3d84c5153cd64840
 Author: Peter Hutterer <peter.hutterer@who-t.net>
 Date:   Thu Nov 5 14:24:24 2020 +1000
diff --git a/app/xkbcomp/Makefile.am b/app/xkbcomp/Makefile.am
index 01632f1f0..9eeb015ea 100644
--- a/app/xkbcomp/Makefile.am
+++ b/app/xkbcomp/Makefile.am
@@ -1,6 +1,6 @@
-# 
+#
 #  Copyright 2005  Red Hat, Inc.
-# 
+#
 #  Permission to use, copy, modify, distribute, and sell this software and its
 #  documentation for any purpose is hereby granted without fee, provided that
 #  the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
 #  specific, written prior permission.  Red Hat makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
-# 
+#
 #  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/app/xkbcomp/Makefile.in b/app/xkbcomp/Makefile.in
index 2ef6e3777..6f4cd7075 100644
--- a/app/xkbcomp/Makefile.in
+++ b/app/xkbcomp/Makefile.in
@@ -14,9 +14,9 @@
 
 @SET_MAKE@
 
-# 
+#
 #  Copyright 2005  Red Hat, Inc.
-# 
+#
 #  Permission to use, copy, modify, distribute, and sell this software and its
 #  documentation for any purpose is hereby granted without fee, provided that
 #  the above copyright notice appear in all copies and that both that
@@ -26,7 +26,7 @@
 #  specific, written prior permission.  Red Hat makes no
 #  representations about the suitability of this software for any purpose.  It
 #  is provided "as is" without express or implied warranty.
-# 
+#
 #  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
 #  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
 #  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/app/xkbcomp/action.c b/app/xkbcomp/action.c
index 02f653e4b..a984bc716 100644
--- a/app/xkbcomp/action.c
+++ b/app/xkbcomp/action.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -299,8 +299,8 @@ fieldText(unsigned field)
 static Bool
 ReportMismatch(unsigned action, unsigned field, const char *type)
 {
-    ERROR2("Value of %s field must be of type %s\n", fieldText(field), type);
-    ACTION1("Action %s definition ignored\n",
+    ERROR("Value of %s field must be of type %s\n", fieldText(field), type);
+    ACTION("Action %s definition ignored\n",
             XkbActionTypeText(action, XkbMessage));
     return False;
 }
@@ -308,7 +308,7 @@ ReportMismatch(unsigned action, unsigned field, const char *type)
 static Bool
 ReportIllegal(unsigned action, unsigned field)
 {
-    ERROR2("Field %s is not defined for an action of type %s\n",
+    ERROR("Field %s is not defined for an action of type %s\n",
            fieldText(field), XkbActionTypeText(action, XkbMessage));
     ACTION("Action definition ignored\n");
     return False;
@@ -317,7 +317,7 @@ ReportIllegal(unsigned action, unsigned field)
 static Bool
 ReportActionNotArray(unsigned action, unsigned field)
 {
-    ERROR2("The %s field in the %s action is not an array\n",
+    ERROR("The %s field in the %s action is not an array\n",
            fieldText(field), XkbActionTypeText(action, XkbMessage));
     ACTION("Action definition ignored\n");
     return False;
@@ -326,8 +326,8 @@ ReportActionNotArray(unsigned action, unsigned field)
 static Bool
 ReportNotFound(unsigned action, unsigned field, const char *what, char *bad)
 {
-    ERROR2("%s named %s not found\n", what, bad);
-    ACTION2("Ignoring the %s field of an %s action\n", fieldText(field),
+    ERROR("%s named %s not found\n", what, bad);
+    ACTION("Ignoring the %s field of an %s action\n", fieldText(field),
             XkbActionTypeText(action, XkbMessage));
     return False;
 }
@@ -513,9 +513,9 @@ CheckGroupField(unsigned action,
         return ReportMismatch(action, F_Group, "integer (range 1..8)");
     if ((rtrn.ival < 1) || (rtrn.ival > XkbNumKbdGroups))
     {
-        ERROR2("Illegal group %d (must be in the range 1..%d)\n", rtrn.ival,
+        ERROR("Illegal group %d (must be in the range 1..%d)\n", rtrn.ival,
                XkbNumKbdGroups);
-        ACTION1("Action %s definition ignored\n",
+        ACTION("Action %s definition ignored\n",
                 XkbActionTypeText(action, XkbMessage));
         return False;
     }
@@ -677,7 +677,7 @@ HandlePtrBtn(XkbDescPtr xkb,
         if ((rtrn.ival < 0) || (rtrn.ival > 5))
         {
             ERROR("Button must specify default or be in the range 1..5\n");
-            ACTION1("Illegal button value %d ignored\n", rtrn.ival);
+            ACTION("Illegal button value %d ignored\n", rtrn.ival);
             return False;
         }
         act->button = rtrn.ival;
@@ -703,7 +703,7 @@ HandlePtrBtn(XkbDescPtr xkb,
         if ((rtrn.ival < 0) || (rtrn.ival > 255))
         {
             ERROR("The count field must have a value in the range 0..255\n");
-            ACTION1("Illegal count %d ignored\n", rtrn.ival);
+            ACTION("Illegal count %d ignored\n", rtrn.ival);
             return False;
         }
         act->count = rtrn.ival;
@@ -760,7 +760,7 @@ HandleSetPtrDflt(XkbDescPtr xkb,
         if ((rtrn.ival < 0) || (rtrn.ival > 5))
         {
             ERROR("New default button value must be in the range 1..5\n");
-            ACTION1("Illegal default button value %d ignored\n", rtrn.ival);
+            ACTION("Illegal default button value %d ignored\n", rtrn.ival);
             return False;
         }
         if (rtrn.ival == 0)
@@ -876,7 +876,7 @@ HandleSwitchScreen(XkbDescPtr xkb,
         if ((rtrn.ival < 0) || (rtrn.ival > 255))
         {
             ERROR("Screen index must be in the range 1..255\n");
-            ACTION1("Illegal screen value %d ignored\n", rtrn.ival);
+            ACTION("Illegal screen value %d ignored\n", rtrn.ival);
             return False;
         }
         if (value->op == OpNegate)
@@ -1020,7 +1020,7 @@ HandleActionMessage(XkbDescPtr xkb,
                 if ((len < 1) || (len > 6))
                 {
                     WARN("An action message can hold only 6 bytes\n");
-                    ACTION1("Extra %d bytes ignored\n", len - 6);
+                    ACTION("Extra %d bytes ignored\n", len - 6);
                 }
                 strncpy((char *) act->message, rtrn.str, 6);
             }
@@ -1039,7 +1039,7 @@ HandleActionMessage(XkbDescPtr xkb,
             if (ndx > 5)
             {
                 ERROR("An action message is at most 6 bytes long\n");
-                ACTION1("Attempt to use data[%d] ignored\n", ndx);
+                ACTION("Attempt to use data[%d] ignored\n", ndx);
                 return False;
             }
             if (!ExprResolveInteger(value, &rtrn, NULL, NULL))
@@ -1047,7 +1047,7 @@ HandleActionMessage(XkbDescPtr xkb,
             if ((rtrn.ival < 0) || (rtrn.ival > 255))
             {
                 ERROR("Message data must be in the range 0..255\n");
-                ACTION1("Illegal datum %d ignored\n", rtrn.ival);
+                ACTION("Illegal datum %d ignored\n", rtrn.ival);
                 return False;
             }
             act->message[ndx] = rtrn.uval;
@@ -1132,7 +1132,7 @@ HandleDeviceBtn(XkbDescPtr xkb,
         if ((rtrn.ival < 0) || (rtrn.ival > 255))
         {
             ERROR("Button must specify default or be in the range 1..255\n");
-            ACTION1("Illegal button value %d ignored\n", rtrn.ival);
+            ACTION("Illegal button value %d ignored\n", rtrn.ival);
             return False;
         }
         act->button = rtrn.ival;
@@ -1158,7 +1158,7 @@ HandleDeviceBtn(XkbDescPtr xkb,
         if ((rtrn.ival < 0) || (rtrn.ival > 255))
         {
             ERROR("The count field must have a value in the range 0..255\n");
-            ACTION1("Illegal count %d ignored\n", rtrn.ival);
+            ACTION("Illegal count %d ignored\n", rtrn.ival);
             return False;
         }
         act->count = rtrn.ival;
@@ -1174,7 +1174,7 @@ HandleDeviceBtn(XkbDescPtr xkb,
         if ((rtrn.ival < 0) || (rtrn.ival > 255))
         {
             ERROR("Device must specify default or be in the range 1..255\n");
-            ACTION1("Illegal device value %d ignored\n", rtrn.ival);
+            ACTION("Illegal device value %d ignored\n", rtrn.ival);
             return False;
         }
         act->device = rtrn.ival;
@@ -1213,7 +1213,7 @@ HandlePrivate(XkbDescPtr xkb,
         if ((rtrn.ival < 0) || (rtrn.ival > 255))
         {
             ERROR("Private action type must be in the range 0..255\n");
-            ACTION1("Illegal type %d ignored\n", rtrn.ival);
+            ACTION("Illegal type %d ignored\n", rtrn.ival);
             return False;
         }
         action->type = rtrn.uval;
@@ -1229,7 +1229,7 @@ HandlePrivate(XkbDescPtr xkb,
                 if ((len < 1) || (len > 7))
                 {
                     WARN("A private action has 7 data bytes\n");
-                    ACTION1("Extra %d bytes ignored\n", len - 6);
+                    ACTION("Extra %d bytes ignored\n", len - 6);
                     return False;
                 }
                 strncpy((char *) action->data, rtrn.str, 7);
@@ -1249,7 +1249,7 @@ HandlePrivate(XkbDescPtr xkb,
             if (ndx > 6)
             {
                 ERROR("The data for a private action is 7 bytes long\n");
-                ACTION1("Attempt to use data[%d] ignored\n", ndx);
+                ACTION("Attempt to use data[%d] ignored\n", ndx);
                 return False;
             }
             if (!ExprResolveInteger(value, &rtrn, NULL, NULL))
@@ -1257,7 +1257,7 @@ HandlePrivate(XkbDescPtr xkb,
             if ((rtrn.ival < 0) || (rtrn.ival > 255))
             {
                 ERROR("All data for a private action must be 0..255\n");
-                ACTION1("Illegal datum %d ignored\n", rtrn.ival);
+                ACTION("Illegal datum %d ignored\n", rtrn.ival);
                 return False;
             }
             action->data[ndx] = rtrn.uval;
@@ -1332,7 +1332,7 @@ HandleActionDef(ExprDef * def,
 
     if (def->op != ExprActionDecl)
     {
-        ERROR1("Expected an action definition, found %s\n",
+        ERROR("Expected an action definition, found %s\n",
                exprOpText(def->op));
         return False;
     }
@@ -1344,7 +1344,7 @@ HandleActionDef(ExprDef * def,
     }
     if (!stringToAction(str, &tmp))
     {
-        ERROR1("Unknown action %s\n", str);
+        ERROR("Unknown action %s\n", str);
         return False;
     }
     action->type = hndlrType = tmp;
@@ -1398,13 +1398,13 @@ HandleActionDef(ExprDef * def,
         if (elemRtrn.str != NULL)
         {
             ERROR("Cannot change defaults in an action definition\n");
-            ACTION2("Ignoring attempt to change %s.%s\n", elemRtrn.str,
+            ACTION("Ignoring attempt to change %s.%s\n", elemRtrn.str,
                     fieldRtrn.str);
             return False;
         }
         if (!stringToField(fieldRtrn.str, &fieldNdx))
         {
-            ERROR1("Unknown field name %s\n", uStringText(fieldRtrn.str));
+            ERROR("Unknown field name %s\n", uStringText(fieldRtrn.str));
             return False;
         }
         if (!(*handleAction[hndlrType])
@@ -1443,14 +1443,14 @@ SetActionField(XkbDescPtr xkb,
             return False;
         if (new->action == XkbSA_NoAction)
         {
-            ERROR1("\"%s\" is not a valid field in a NoAction action\n",
+            ERROR("\"%s\" is not a valid field in a NoAction action\n",
                    field);
             return False;
         }
     }
     if (!stringToField(field, &new->field))
     {
-        ERROR1("\"%s\" is not a legal field name\n", field);
+        ERROR("\"%s\" is not a legal field name\n", field);
         return False;
     }
     new->array_ndx = array_ndx;
diff --git a/app/xkbcomp/action.h b/app/xkbcomp/action.h
index 983b06e20..bd9273d8c 100644
--- a/app/xkbcomp/action.h
+++ b/app/xkbcomp/action.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/alias.c b/app/xkbcomp/alias.c
index f28c2d286..b9d44ef65 100644
--- a/app/xkbcomp/alias.c
+++ b/app/xkbcomp/alias.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -39,7 +39,7 @@ HandleCollision(AliasInfo * old, AliasInfo * new)
         if (((new->def.fileID == old->def.fileID) && (warningLevel > 0)) ||
             (warningLevel > 9))
         {
-            WARN2("Alias of %s for %s declared more than once\n",
+            WARN("Alias of %s for %s declared more than once\n",
                   XkbKeyNameText(new->alias, XkbMessage),
                   XkbKeyNameText(new->real, XkbMessage));
             ACTION("First definition ignored\n");
@@ -61,9 +61,9 @@ HandleCollision(AliasInfo * old, AliasInfo * new)
         if (((old->def.fileID == new->def.fileID) && (warningLevel > 0)) ||
             (warningLevel > 9))
         {
-            WARN1("Multiple definitions for alias %s\n",
+            WARN("Multiple definitions for alias %s\n",
                   XkbKeyNameText(old->alias, XkbMessage));
-            ACTION2("Using %s, ignoring %s\n",
+            ACTION("Using %s, ignoring %s\n",
                     XkbKeyNameText(use, XkbMessage),
                     XkbKeyNameText(ignore, XkbMessage));
         }
@@ -187,7 +187,7 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
         {
             if (warningLevel > 4)
             {
-                WARN2("Attempt to alias %s to non-existent key %s\n",
+                WARN("Attempt to alias %s to non-existent key %s\n",
                       XkbKeyNameText(info->alias, XkbMessage),
                       XkbKeyNameText(info->real, XkbMessage));
                 ACTION("Ignored\n");
@@ -201,7 +201,7 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
             if (warningLevel > 4)
             {
                 WARN("Attempt to create alias with the name of a real key\n");
-                ACTION2("Alias \"%s = %s\" ignored\n",
+                ACTION("Alias \"%s = %s\" ignored\n",
                         XkbKeyNameText(info->alias, XkbMessage),
                         XkbKeyNameText(info->real, XkbMessage));
             }
@@ -277,7 +277,7 @@ ApplyAliases(XkbDescPtr xkb, Bool toGeom, AliasInfo ** info_in)
 #ifdef DEBUG
     if ((a - old) != (nOld + nNew))
     {
-        WSGO2("Expected %d aliases total but created %d\n", nOld + nNew,
+        WSGO("Expected %d aliases total but created %d\n", nOld + nNew,
               (int)(a - old));
     }
 #endif
diff --git a/app/xkbcomp/alias.h b/app/xkbcomp/alias.h
index b6fac5bfa..93e05275e 100644
--- a/app/xkbcomp/alias.h
+++ b/app/xkbcomp/alias.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/compat.c b/app/xkbcomp/compat.c
index 82fd4e666..8a883c92d 100644
--- a/app/xkbcomp/compat.c
+++ b/app/xkbcomp/compat.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -91,7 +91,7 @@ siText(SymInterpInfo * si, CompatInfo * info)
     }
     else
     {
-        snprintf(buf, sizeof(buf), "%s+%s(%s)", 
+        snprintf(buf, sizeof(buf), "%s+%s(%s)",
 		XkbKeysymText(si->interp.sym, XkbMessage),
                 XkbSIMatchText(si->interp.match, XkbMessage),
                 XkbModMaskText(si->interp.mods, XkbMessage));
@@ -211,7 +211,7 @@ AddInterp(CompatInfo * info, SymInterpInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Multiple definitions for \"%s\"\n", siText(new, info));
+                WARN("Multiple definitions for \"%s\"\n", siText(new, info));
                 ACTION("Earlier interpretation ignored\n");
             }
             *old = *new;
@@ -248,8 +248,8 @@ AddInterp(CompatInfo * info, SymInterpInfo * new)
         }
         if (collide)
         {
-            WARN1("Multiple interpretations of \"%s\"\n", siText(new, info));
-            ACTION1("Using %s definition for duplicate fields\n",
+            WARN("Multiple interpretations of \"%s\"\n", siText(new, info));
+            ACTION("Using %s definition for duplicate fields\n",
                     (new->defs.merge != MergeAugment ? "last" : "first"));
         }
         return True;
@@ -277,8 +277,8 @@ AddGroupCompat(CompatInfo * info, unsigned group, GroupCompatInfo * newGC)
     if (((gc->defined && gc->fileID == newGC->fileID) && (warningLevel > 0))
         || (warningLevel > 9))
     {
-        WARN1("Compat map for group %d redefined\n", group + 1);
-        ACTION1("Using %s definition\n",
+        WARN("Compat map for group %d redefined\n", group + 1);
+        ACTION("Using %s definition\n",
                 (merge == MergeAugment ? "old" : "new"));
     }
     if(newGC->defined && (merge != MergeAugment || !gc->defined))
@@ -319,7 +319,7 @@ ResolveStateAndPredicate(ExprDef * expr,
             *pred_rtrn = XkbSI_Exactly;
         else
         {
-            ERROR1("Illegal modifier predicate \"%s\"\n", pred_txt);
+            ERROR("Illegal modifier predicate \"%s\"\n", pred_txt);
             ACTION("Ignored\n");
             return False;
         }
@@ -699,9 +699,9 @@ HandleGroupCompatDef(GroupCompatDef * def,
         merge = def->merge;
     if (!XkbIsLegalGroup(def->group - 1))
     {
-        ERROR1("Keyboard group must be in the range 1..%d\n",
+        ERROR("Keyboard group must be in the range 1..%d\n",
                XkbNumKbdGroups + 1);
-        ACTION1("Compatibility map for illegal group %d ignored\n",
+        ACTION("Compatibility map for illegal group %d ignored\n",
                 def->group);
         return False;
     }
@@ -710,7 +710,7 @@ HandleGroupCompatDef(GroupCompatDef * def,
     if (!ExprResolveModMask(def->def, &val, LookupVModMask, (XPointer) xkb))
     {
         ERROR("Expected a modifier mask in group compatibility definition\n");
-        ACTION1("Ignoring illegal compatibility map for group %d\n",
+        ACTION("Ignoring illegal compatibility map for group %d\n",
                 def->group);
         return False;
     }
@@ -773,7 +773,7 @@ HandleCompatMapFile(XkbFile * file,
             info->errorCount++;
             break;
         default:
-            WSGO1("Unexpected statement type %d in HandleCompatMapFile\n",
+            WSGO("Unexpected statement type %d in HandleCompatMapFile\n",
                   stmt->stmtType);
             break;
         }
@@ -783,7 +783,7 @@ HandleCompatMapFile(XkbFile * file,
 #ifdef NOISY
             ERROR("Too many errors\n");
 #endif
-            ACTION1("Abandoning compatibility map \"%s\"\n", file->topName);
+            ACTION("Abandoning compatibility map \"%s\"\n", file->topName);
             break;
         }
     }
@@ -846,7 +846,7 @@ CompileCompatMap(XkbFile * file,
             else
             {
                 WSGO("Couldn't allocate space for compat name\n");
-                ACTION2("Name \"%s\" (from %s) NOT assigned\n",
+                ACTION("Name \"%s\" (from %s) NOT assigned\n",
                         scanFile, info.name);
             }
         }
diff --git a/app/xkbcomp/configure b/app/xkbcomp/configure
index 01990eb5a..7fce80be0 100644
--- a/app/xkbcomp/configure
+++ b/app/xkbcomp/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkbcomp 1.4.4.
+# Generated by GNU Autoconf 2.69 for xkbcomp 1.4.5.
 #
 # Report bugs to <https://gitlab.freedesktop.org/xorg/app/xkbcomp/issues>.
 #
@@ -581,8 +581,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkbcomp'
 PACKAGE_TARNAME='xkbcomp'
-PACKAGE_VERSION='1.4.4'
-PACKAGE_STRING='xkbcomp 1.4.4'
+PACKAGE_VERSION='1.4.5'
+PACKAGE_STRING='xkbcomp 1.4.5'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xkbcomp/issues'
 PACKAGE_URL=''
 
@@ -1329,7 +1329,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkbcomp 1.4.4 to adapt to many kinds of systems.
+\`configure' configures xkbcomp 1.4.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1400,7 +1400,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xkbcomp 1.4.4:";;
+     short | recursive ) echo "Configuration of xkbcomp 1.4.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1522,7 +1522,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkbcomp configure 1.4.4
+xkbcomp configure 1.4.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1846,7 +1846,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkbcomp $as_me 1.4.4, which was
+It was created by xkbcomp $as_me 1.4.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2675,7 +2675,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkbcomp'
- VERSION='1.4.4'
+ VERSION='1.4.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11240,7 +11240,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xkbcomp $as_me 1.4.4, which was
+This file was extended by xkbcomp $as_me 1.4.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -11306,7 +11306,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xkbcomp config.status 1.4.4
+xkbcomp config.status 1.4.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/app/xkbcomp/configure.ac b/app/xkbcomp/configure.ac
index d4b27408c..2af0b16ae 100644
--- a/app/xkbcomp/configure.ac
+++ b/app/xkbcomp/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xkbcomp], [1.4.4],
+AC_INIT([xkbcomp], [1.4.5],
         [https://gitlab.freedesktop.org/xorg/app/xkbcomp/issues], [xkbcomp])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
diff --git a/app/xkbcomp/expr.c b/app/xkbcomp/expr.c
index 841ab0712..3555d64a4 100644
--- a/app/xkbcomp/expr.c
+++ b/app/xkbcomp/expr.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -149,7 +149,7 @@ ExprResolveLhs(ExprDef * expr,
         *index_rtrn = expr->value.array.entry;
         return True;
     }
-    WSGO1("Unexpected operator %d in ResolveLhs\n", expr->op);
+    WSGO("Unexpected operator %d in ResolveLhs\n", expr->op);
     return False;
 }
 
@@ -299,7 +299,7 @@ ExprResolveModIndex(ExprDef * expr,
     case ExprValue:
         if (expr->type != TypeInt)
         {
-            ERROR1
+            ERROR
                 ("Found constant of type %s where a modifier mask was expected\n",
                  exprTypeText(expr->type));
             return False;
@@ -307,7 +307,7 @@ ExprResolveModIndex(ExprDef * expr,
         else if ((expr->value.ival >= XkbNumModifiers)
                  || (expr->value.ival < 0))
         {
-            ERROR2("Illegal modifier index (%d, must be 0..%d)\n",
+            ERROR("Illegal modifier index (%d, must be 0..%d)\n",
                    expr->value.ival, XkbNumModifiers - 1);
             return False;
         }
@@ -325,7 +325,7 @@ ExprResolveModIndex(ExprDef * expr,
                             None, expr->value.str, TypeInt, val_rtrn);
         }
         if (!ok)
-            ERROR1("Cannot determine modifier index for \"%s\"\n",
+            ERROR("Cannot determine modifier index for \"%s\"\n",
                    XkbAtomText(NULL, expr->value.str, XkbMessage));
         break;
     case ExprFieldRef:
@@ -351,12 +351,12 @@ ExprResolveModIndex(ExprDef * expr,
         bogus = "assignment";
         break;
     default:
-        WSGO1("Unknown operator %d in ResolveModIndex\n", expr->op);
+        WSGO("Unknown operator %d in ResolveModIndex\n", expr->op);
         return False;
     }
     if (bogus)
     {
-        ERROR1("Modifier index must be a name or number, %s ignored\n",
+        ERROR("Modifier index must be a name or number, %s ignored\n",
                bogus);
         return False;
     }
@@ -389,7 +389,7 @@ ExprResolveBoolean(ExprDef * expr,
     case ExprValue:
         if (expr->type != TypeBoolean)
         {
-            ERROR1
+            ERROR
                 ("Found constant of type %s where boolean was expected\n",
                  exprTypeText(expr->type));
             return False;
@@ -421,7 +421,7 @@ ExprResolveBoolean(ExprDef * expr,
                             None, expr->value.str, TypeBoolean, val_rtrn);
         }
         if (!ok)
-            ERROR1("Identifier \"%s\" of type int is unknown\n",
+            ERROR("Identifier \"%s\" of type int is unknown\n",
                    XkbAtomText(NULL, expr->value.str, XkbMessage));
         return ok;
     case ExprFieldRef:
@@ -432,7 +432,7 @@ ExprResolveBoolean(ExprDef * expr,
                             expr->value.field.field, TypeBoolean, val_rtrn);
         }
         if (!ok)
-            ERROR2("Default \"%s.%s\" of type boolean is unknown\n",
+            ERROR("Default \"%s.%s\" of type boolean is unknown\n",
                    XkbAtomText(NULL, expr->value.field.element, XkbMessage),
                    XkbAtomText(NULL, expr->value.field.field, XkbMessage));
         return ok;
@@ -460,13 +460,13 @@ ExprResolveBoolean(ExprDef * expr,
     case OpNegate:
         if (bogus == NULL)
             bogus = "Negation";
-        ERROR1("%s of boolean values not permitted\n", bogus);
+        ERROR("%s of boolean values not permitted\n", bogus);
         break;
     case OpUnaryPlus:
         ERROR("Unary \"+\" operator not permitted for boolean values\n");
         break;
     default:
-        WSGO1("Unknown operator %d in ResolveBoolean\n", expr->op);
+        WSGO("Unknown operator %d in ResolveBoolean\n", expr->op);
         break;
     }
     return False;
@@ -496,7 +496,7 @@ ExprResolveFloat(ExprDef * expr,
         }
         if ((expr->type != TypeInt) && (expr->type != TypeFloat))
         {
-            ERROR1("Found constant of type %s, expected a number\n",
+            ERROR("Found constant of type %s, expected a number\n",
                    exprTypeText(expr->type));
             return False;
         }
@@ -511,7 +511,7 @@ ExprResolveFloat(ExprDef * expr,
                             None, expr->value.str, TypeFloat, val_rtrn);
         }
         if (!ok)
-            ERROR1("Numeric identifier \"%s\" unknown\n",
+            ERROR("Numeric identifier \"%s\" unknown\n",
                    XkbAtomText(NULL, expr->value.str, XkbMessage));
         return ok;
     case ExprFieldRef:
@@ -522,7 +522,7 @@ ExprResolveFloat(ExprDef * expr,
                             expr->value.field.field, TypeFloat, val_rtrn);
         }
         if (!ok)
-            ERROR2("Numeric default \"%s.%s\" unknown\n",
+            ERROR("Numeric default \"%s.%s\" unknown\n",
                    XkbAtomText(NULL, expr->value.field.element, XkbMessage),
                    XkbAtomText(NULL, expr->value.field.field, XkbMessage));
         return ok;
@@ -579,7 +579,7 @@ ExprResolveFloat(ExprDef * expr,
         left = expr->value.child;
         return ExprResolveFloat(left, val_rtrn, lookup, lookupPriv);
     default:
-        WSGO1("Unknown operator %d in ResolveFloat\n", expr->op);
+        WSGO("Unknown operator %d in ResolveFloat\n", expr->op);
         break;
     }
     return False;
@@ -616,7 +616,7 @@ ExprResolveInteger(ExprDef * expr,
         }
         if ((expr->type != TypeInt) && (expr->type != TypeFloat))
         {
-            ERROR1
+            ERROR
                 ("Found constant of type %s where an int was expected\n",
                  exprTypeText(expr->type));
             return False;
@@ -632,7 +632,7 @@ ExprResolveInteger(ExprDef * expr,
                             None, expr->value.str, TypeInt, val_rtrn);
         }
         if (!ok)
-            ERROR1("Identifier \"%s\" of type int is unknown\n",
+            ERROR("Identifier \"%s\" of type int is unknown\n",
                    XkbAtomText(NULL, expr->value.str, XkbMessage));
         return ok;
     case ExprFieldRef:
@@ -643,7 +643,7 @@ ExprResolveInteger(ExprDef * expr,
                             expr->value.field.field, TypeInt, val_rtrn);
         }
         if (!ok)
-            ERROR2("Default \"%s.%s\" of type int is unknown\n",
+            ERROR("Default \"%s.%s\" of type int is unknown\n",
                    XkbAtomText(NULL, expr->value.field.element, XkbMessage),
                    XkbAtomText(NULL, expr->value.field.field, XkbMessage));
         return ok;
@@ -700,7 +700,7 @@ ExprResolveInteger(ExprDef * expr,
         left = expr->value.child;
         return ExprResolveInteger(left, val_rtrn, lookup, lookupPriv);
     default:
-        WSGO1("Unknown operator %d in ResolveInteger\n", expr->op);
+        WSGO("Unknown operator %d in ResolveInteger\n", expr->op);
         break;
     }
     return False;
@@ -722,7 +722,7 @@ ExprResolveString(ExprDef * expr,
     case ExprValue:
         if (expr->type != TypeString)
         {
-            ERROR1("Found constant of type %s, expected a string\n",
+            ERROR("Found constant of type %s, expected a string\n",
                    exprTypeText(expr->type));
             return False;
         }
@@ -740,7 +740,7 @@ ExprResolveString(ExprDef * expr,
                             None, expr->value.str, TypeString, val_rtrn);
         }
         if (!ok)
-            ERROR1("Identifier \"%s\" of type string not found\n",
+            ERROR("Identifier \"%s\" of type string not found\n",
                    XkbAtomText(NULL, expr->value.str, XkbMessage));
         return ok;
     case ExprFieldRef:
@@ -751,7 +751,7 @@ ExprResolveString(ExprDef * expr,
                             expr->value.field.field, TypeString, val_rtrn);
         }
         if (!ok)
-            ERROR2("Default \"%s.%s\" of type string not found\n",
+            ERROR("Default \"%s.%s\" of type string not found\n",
                    XkbAtomText(NULL, expr->value.field.element, XkbMessage),
                    XkbAtomText(NULL, expr->value.field.field, XkbMessage));
         return ok;
@@ -791,7 +791,7 @@ ExprResolveString(ExprDef * expr,
     case OpInvert:
         if (bogus == NULL)
             bogus = "Bitwise complement";
-        ERROR1("%s of string values not permitted\n", bogus);
+        ERROR("%s of string values not permitted\n", bogus);
         return False;
     case OpNot:
         left = expr->value.child;
@@ -808,7 +808,7 @@ ExprResolveString(ExprDef * expr,
         }
         return False;
     default:
-        WSGO1("Unknown operator %d in ResolveString\n", expr->op);
+        WSGO("Unknown operator %d in ResolveString\n", expr->op);
         break;
     }
     return False;
@@ -829,7 +829,7 @@ ExprResolveKeyName(ExprDef * expr,
     case ExprValue:
         if (expr->type != TypeKeyName)
         {
-            ERROR1("Found constant of type %s, expected a key name\n",
+            ERROR("Found constant of type %s, expected a key name\n",
                    exprTypeText(expr->type));
             return False;
         }
@@ -842,7 +842,7 @@ ExprResolveKeyName(ExprDef * expr,
                             None, expr->value.str, TypeString, val_rtrn);
         }
         if (!ok)
-            ERROR1("Identifier \"%s\" of type string not found\n",
+            ERROR("Identifier \"%s\" of type string not found\n",
                    XkbAtomText(NULL, expr->value.str, XkbMessage));
         return ok;
     case ExprFieldRef:
@@ -853,7 +853,7 @@ ExprResolveKeyName(ExprDef * expr,
                             expr->value.field.field, TypeString, val_rtrn);
         }
         if (!ok)
-            ERROR2("Default \"%s.%s\" of type key name not found\n",
+            ERROR("Default \"%s.%s\" of type key name not found\n",
                    XkbAtomText(NULL, expr->value.field.element, XkbMessage),
                    XkbAtomText(NULL, expr->value.field.field, XkbMessage));
         return ok;
@@ -878,7 +878,7 @@ ExprResolveKeyName(ExprDef * expr,
     case OpInvert:
         if (bogus == NULL)
             bogus = "Bitwise complement";
-        ERROR1("%s of key name values not permitted\n", bogus);
+        ERROR("%s of key name values not permitted\n", bogus);
         return False;
     case OpNot:
         left = expr->value.binary.left;
@@ -895,7 +895,7 @@ ExprResolveKeyName(ExprDef * expr,
         }
         return False;
     default:
-        WSGO1("Unknown operator %d in ResolveKeyName\n", expr->op);
+        WSGO("Unknown operator %d in ResolveKeyName\n", expr->op);
         break;
     }
     return False;
@@ -908,7 +908,7 @@ ExprResolveEnum(ExprDef * expr, ExprResult * val_rtrn, LookupEntry * values)
 {
     if (expr->op != ExprIdent)
     {
-        ERROR1("Found a %s where an enumerated value was expected\n",
+        ERROR("Found a %s where an enumerated value was expected\n",
                exprOpText(expr->op));
         return False;
     }
@@ -916,14 +916,14 @@ ExprResolveEnum(ExprDef * expr, ExprResult * val_rtrn, LookupEntry * values)
                       (unsigned) TypeInt, val_rtrn))
     {
         int nOut = 0;
-        ERROR1("Illegal identifier %s (expected one of: ",
+        ERROR("Illegal identifier %s (expected one of: ",
                XkbAtomText(NULL, expr->value.str, XkbMessage));
         while (values && values->name)
         {
             if (nOut != 0)
-                INFO1(", %s", values->name);
+                INFO(", %s", values->name);
             else
-                INFO1("%s", values->name);
+                INFO("%s", values->name);
             values++;
             nOut++;
         }
@@ -948,7 +948,7 @@ ExprResolveMask(ExprDef * expr,
     case ExprValue:
         if (expr->type != TypeInt)
         {
-            ERROR1
+            ERROR
                 ("Found constant of type %s where a mask was expected\n",
                  exprTypeText(expr->type));
             return False;
@@ -962,7 +962,7 @@ ExprResolveMask(ExprDef * expr,
                             None, expr->value.str, TypeInt, val_rtrn);
         }
         if (!ok)
-            ERROR1("Identifier \"%s\" of type int is unknown\n",
+            ERROR("Identifier \"%s\" of type int is unknown\n",
                    XkbAtomText(NULL, expr->value.str, XkbMessage));
         return ok;
     case ExprFieldRef:
@@ -973,7 +973,7 @@ ExprResolveMask(ExprDef * expr,
                             expr->value.field.field, TypeInt, val_rtrn);
         }
         if (!ok)
-            ERROR2("Default \"%s.%s\" of type int is unknown\n",
+            ERROR("Default \"%s.%s\" of type int is unknown\n",
                    XkbAtomText(NULL, expr->value.field.element, XkbMessage),
                    XkbAtomText(NULL, expr->value.field.field, XkbMessage));
         return ok;
@@ -982,7 +982,7 @@ ExprResolveMask(ExprDef * expr,
     case ExprActionDecl:
         if (bogus == NULL)
             bogus = "function use";
-        ERROR1("Unexpected %s in mask expression\n", bogus);
+        ERROR("Unexpected %s in mask expression\n", bogus);
         ACTION("Expression ignored\n");
         return False;
     case OpAdd:
@@ -1004,7 +1004,7 @@ ExprResolveMask(ExprDef * expr,
                 break;
             case OpMultiply:
             case OpDivide:
-                ERROR1("Cannot %s masks\n",
+                ERROR("Cannot %s masks\n",
                        expr->op == OpDivide ? "divide" : "multiply");
                 ACTION("Illegal operation ignored\n");
                 return False;
@@ -1029,12 +1029,12 @@ ExprResolveMask(ExprDef * expr,
         left = expr->value.child;
         if (ExprResolveInteger(left, &leftRtrn, lookup, lookupPriv))
         {
-            ERROR1("The %s operator cannot be used with a mask\n",
+            ERROR("The %s operator cannot be used with a mask\n",
                    (expr->op == OpNegate ? "-" : "!"));
         }
         return False;
     default:
-        WSGO1("Unknown operator %d in ResolveMask\n", expr->op);
+        WSGO("Unknown operator %d in ResolveMask\n", expr->op);
         break;
     }
     return False;
diff --git a/app/xkbcomp/expr.h b/app/xkbcomp/expr.h
index 02519f941..163d474e5 100644
--- a/app/xkbcomp/expr.h
+++ b/app/xkbcomp/expr.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/geometry.c b/app/xkbcomp/geometry.c
index a5fc15404..a75961662 100644
--- a/app/xkbcomp/geometry.c
+++ b/app/xkbcomp/geometry.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -744,9 +744,9 @@ AddProperty(GeometryInfo * info, PropertyInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Multiple definitions for the \"%s\" property\n",
+                WARN("Multiple definitions for the \"%s\" property\n",
                       new->name);
-                ACTION2("Ignoring \"%s\", using \"%s\"\n", old->value,
+                ACTION("Ignoring \"%s\", using \"%s\"\n", old->value,
                         new->value);
             }
             if (old->value)
@@ -757,8 +757,8 @@ AddProperty(GeometryInfo * info, PropertyInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple definitions for \"%s\" property\n", new->name);
-            ACTION2("Using \"%s\", ignoring \"%s\" \n", old->value,
+            WARN("Multiple definitions for \"%s\" property\n", new->name);
+            ACTION("Using \"%s\", ignoring \"%s\" \n", old->value,
                     new->value);
         }
         return True;
@@ -804,11 +804,11 @@ FindShape(GeometryInfo * info, Atom name, const char *type, const char *which)
     if (type != NULL)
     {
         old = info->shapes;
-        WARN3("Unknown shape \"%s\" for %s %s\n",
+        WARN("Unknown shape \"%s\" for %s %s\n",
               XkbAtomText(info->dpy, name, XkbMessage), type, which);
         if (old)
         {
-            ACTION1("Using default shape %s instead\n",
+            ACTION("Using default shape %s instead\n",
                     shText(info->dpy, old));
             return old;
         }
@@ -833,7 +833,7 @@ AddShape(GeometryInfo * info, ShapeInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Duplicate shape name \"%s\"\n",
+                WARN("Duplicate shape name \"%s\"\n",
                       shText(info->dpy, old));
                 ACTION("Using last definition\n");
             }
@@ -844,7 +844,7 @@ AddShape(GeometryInfo * info, ShapeInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple shapes named \"%s\"\n", shText(info->dpy, old));
+            WARN("Multiple shapes named \"%s\"\n", shText(info->dpy, old));
             ACTION("Using first definition\n");
         }
         return True;
@@ -940,7 +940,7 @@ AddDoodad(SectionInfo * si, GeometryInfo * info, DoodadInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Multiple doodads named \"%s\"\n",
+                WARN("Multiple doodads named \"%s\"\n",
                       XkbAtomText(info->dpy, old->name, XkbMessage));
                 ACTION("Using last definition\n");
             }
@@ -951,7 +951,7 @@ AddDoodad(SectionInfo * si, GeometryInfo * info, DoodadInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple doodads named \"%s\"\n",
+            WARN("Multiple doodads named \"%s\"\n",
                   XkbAtomText(info->dpy, old->name, XkbMessage));
             ACTION("Using first definition\n");
         }
@@ -1023,7 +1023,7 @@ AddOverlay(SectionInfo * si, GeometryInfo * info, OverlayInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN2
+                WARN
                     ("Multiple overlays named \"%s\" for section \"%s\"\n",
                      XkbAtomText(info->dpy, old->name, XkbMessage),
                      XkbAtomText(info->dpy, si->name, XkbMessage));
@@ -1039,7 +1039,7 @@ AddOverlay(SectionInfo * si, GeometryInfo * info, OverlayInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN2("Multiple doodads named \"%s\" in section \"%s\"\n",
+            WARN("Multiple doodads named \"%s\" in section \"%s\"\n",
                   XkbAtomText(info->dpy, old->name, XkbMessage),
                   XkbAtomText(info->dpy, si->name, XkbMessage));
             ACTION("Using first definition\n");
@@ -1053,7 +1053,7 @@ AddOverlay(SectionInfo * si, GeometryInfo * info, OverlayInfo * new)
         if (warningLevel > 0)
         {
             WSGO("Couldn't allocate a new OverlayInfo\n");
-            ACTION2
+            ACTION
                 ("Overlay \"%s\" in section \"%s\" will be incomplete\n",
                  XkbAtomText(info->dpy, old->name, XkbMessage),
                  XkbAtomText(info->dpy, si->name, XkbMessage));
@@ -1122,7 +1122,7 @@ AddSection(GeometryInfo * info, SectionInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Duplicate shape name \"%s\"\n",
+                WARN("Duplicate shape name \"%s\"\n",
                       shText(info->dpy, old));
                 ACTION("Using last definition\n");
             }
@@ -1133,7 +1133,7 @@ AddSection(GeometryInfo * info, SectionInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple shapes named \"%s\"\n", shText(info->dpy, old));
+            WARN("Multiple shapes named \"%s\"\n", shText(info->dpy, old));
             ACTION("Using first definition\n");
         }
         return True;
@@ -1808,9 +1808,9 @@ SetDoodadField(DoodadInfo * di,
         if ((tmp.ival < 0) || (tmp.ival > XkbGeomMaxPriority))
         {
             info->errorCount++;
-            ERROR2("Doodad priority %d out of range (must be 0..%d)\n",
+            ERROR("Doodad priority %d out of range (must be 0..%d)\n",
                    tmp.ival, XkbGeomMaxPriority);
-            ACTION1("Priority for doodad %s not changed",
+            ACTION("Priority for doodad %s not changed",
                     ddText(info->dpy, di));
             return False;
         }
@@ -1881,9 +1881,9 @@ SetDoodadField(DoodadInfo * di,
     case XkbLogoDoodad:
         return SetLogoDoodadField(di, field, arrayNdx, value, si, info);
     }
-    WSGO1("Unknown doodad type %d in SetDoodadField\n",
+    WSGO("Unknown doodad type %d in SetDoodadField\n",
           (unsigned int) di->type);
-    ACTION2("Definition of %s in %s ignored\n", field, ddText(info->dpy, di));
+    ACTION("Definition of %s in %s ignored\n", field, ddText(info->dpy, di));
     return False;
 }
 
@@ -1916,9 +1916,9 @@ SetSectionField(SectionInfo * si,
         if ((tmp.ival < 0) || (tmp.ival > XkbGeomMaxPriority))
         {
             info->errorCount++;
-            ERROR2("Section priority %d out of range (must be 0..%d)\n",
+            ERROR("Section priority %d out of range (must be 0..%d)\n",
                    tmp.ival, XkbGeomMaxPriority);
-            ACTION1("Priority for section %s not changed",
+            ACTION("Priority for section %s not changed",
                     scText(info->dpy, si));
             return False;
         }
@@ -2131,7 +2131,7 @@ SetGeometryProperty(GeometryInfo * info, char *property, ExprDef * value)
     {
         info->errorCount++;
         ERROR("Property values must be type string\n");
-        ACTION1("Ignoring illegal definition of \"%s\" property\n", property);
+        ACTION("Ignoring illegal definition of \"%s\" property\n", property);
         return False;
     }
     pi.value = result.str;
@@ -2166,7 +2166,7 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
         if (ndx != NULL)
         {
             info->errorCount++;
-            ERROR1("The %s geometry property is not an array\n", field.str);
+            ERROR("The %s geometry property is not an array\n", field.str);
             ACTION("Ignoring illegal property definition\n");
             return False;
         }
@@ -2220,7 +2220,7 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
     if (elem.str)
     {
         WARN("Assignment to field of unknown element\n");
-        ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+        ACTION("No value assigned to %s.%s\n", elem.str, field.str);
         return False;
     }
 
@@ -2240,16 +2240,16 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
         if (tmp.ival < 1)
         {
             WARN("Keyboard width must be positive\n");
-            ACTION1("Ignoring illegal keyboard width %s\n",
+            ACTION("Ignoring illegal keyboard width %s\n",
                     XkbGeomFPText(tmp.ival, XkbMessage));
             return True;
         }
         if (info->widthMM != 0)
         {
             WARN("Keyboard width multiply defined\n");
-            ACTION1("Using last definition (%s),",
+            ACTION("Using last definition (%s),",
                     XkbGeomFPText(tmp.ival, XkbMessage));
-            INFO1(" ignoring first (%s)\n",
+            INFO(" ignoring first (%s)\n",
                   XkbGeomFPText(info->widthMM, XkbMessage));
         }
         info->widthMM = tmp.ival;
@@ -2271,16 +2271,16 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
         if (tmp.ival < 1)
         {
             WARN("Keyboard height must be positive\n");
-            ACTION1("Ignoring illegal keyboard height %s\n",
+            ACTION("Ignoring illegal keyboard height %s\n",
                     XkbGeomFPText(tmp.ival, XkbMessage));
             return True;
         }
         if (info->heightMM != 0)
         {
             WARN("Keyboard height multiply defined\n");
-            ACTION1("Using last definition (%s),",
+            ACTION("Using last definition (%s),",
                     XkbGeomFPText(tmp.ival, XkbMessage));
-            INFO1(" ignoring first (%s)\n",
+            INFO(" ignoring first (%s)\n",
                   XkbGeomFPText(info->heightMM, XkbMessage));
         }
         info->heightMM = tmp.ival;
@@ -2330,7 +2330,7 @@ HandleGeometryVar(VarDef * stmt, XkbDescPtr xkb, GeometryInfo * info)
         if ((tmp.ival < 40) || (tmp.ival > 2550))
         {
             info->errorCount++;
-            ERROR1("Illegal font size %d (must be 4..255)\n", tmp.ival);
+            ERROR("Illegal font size %d (must be 4..255)\n", tmp.ival);
             ACTION("Ignoring font size in keyboard geometry\n");
             return False;
         }
@@ -2400,7 +2400,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
 
     if (def->nOutlines < 1)
     {
-        WARN1("Shape \"%s\" has no outlines\n", shText(info->dpy, si));
+        WARN("Shape \"%s\" has no outlines\n", shText(info->dpy, si));
         ACTION("Definition ignored\n");
         return True;
     }
@@ -2408,7 +2408,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
     si->outlines = uTypedCalloc(def->nOutlines, XkbOutlineRec);
     if (!si->outlines)
     {
-        ERROR1("Couldn't allocate outlines for \"%s\"\n",
+        ERROR("Couldn't allocate outlines for \"%s\"\n",
                shText(info->dpy, si));
         ACTION("Definition ignored\n");
         info->errorCount++;
@@ -2429,7 +2429,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
         outline->points = uTypedCalloc(ol->nPoints, XkbPointRec);
         if (!outline->points)
         {
-            ERROR1("Can't allocate points for \"%s\"\n",
+            ERROR("Can't allocate points for \"%s\"\n",
                    shText(info->dpy, si));
             ACTION("Definition ignored\n");
             info->errorCount++;
@@ -2452,7 +2452,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
                     si->approx = outline;
                 else
                 {
-                    WARN1("Multiple approximations for \"%s\"\n",
+                    WARN("Multiple approximations for \"%s\"\n",
                           shText(info->dpy, si));
                     ACTION("Treating all but the first as normal outlines\n");
                 }
@@ -2463,14 +2463,14 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
                     si->primary = outline;
                 else
                 {
-                    WARN1("Multiple primary outlines for \"%s\"\n",
+                    WARN("Multiple primary outlines for \"%s\"\n",
                           shText(info->dpy, si));
                     ACTION("Treating all but the first as normal outlines\n");
                 }
             }
             else
             {
-                WARN2("Unknown outline type %s for \"%s\"\n", str,
+                WARN("Unknown outline type %s for \"%s\"\n", str,
                       shText(info->dpy, si));
                 ACTION("Treated as a normal outline\n");
             }
@@ -2478,7 +2478,7 @@ HandleShapeBody(ShapeDef * def, ShapeInfo * si, unsigned merge,
     }
     if (nOut != si->nOutlines)
     {
-        WSGO2("Expected %d outlines, got %d\n",
+        WSGO("Expected %d outlines, got %d\n",
               (unsigned int) si->nOutlines, nOut);
         si->nOutlines = nOut;
     }
@@ -2531,9 +2531,9 @@ HandleDoodadDef(DoodadDef * def,
             return 0;           /* internal error, already reported */
         if (elem.str != NULL)
         {
-            WARN1("Assignment to field of unknown element in doodad %s\n",
+            WARN("Assignment to field of unknown element in doodad %s\n",
                   ddText(info->dpy, &new));
-            ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+            ACTION("No value assigned to %s.%s\n", elem.str, field.str);
         }
         else if (!SetDoodadField(&new, field.str, ndx, var->value, si, info))
             return False;
@@ -2556,7 +2556,7 @@ HandleOverlayDef(OverlayDef * def,
 
     if ((def->nKeys < 1) && (warningLevel > 3))
     {
-        WARN2("Overlay \"%s\" in section \"%s\" has no keys\n",
+        WARN("Overlay \"%s\" in section \"%s\" has no keys\n",
               XkbAtomText(NULL, def->name, XkbMessage), scText(info->dpy,
                                                                si));
         ACTION("Overlay ignored\n");
@@ -2572,7 +2572,7 @@ HandleOverlayDef(OverlayDef * def,
         if ((!key) && warningLevel > 0)
         {
             WSGO("Couldn't allocate OverlayKeyInfo\n");
-            ACTION2("Overlay %s for section %s will be incomplete\n",
+            ACTION("Overlay %s for section %s will be incomplete\n",
                     XkbAtomText(info->dpy, ol.name, XkbMessage),
                     scText(info->dpy, si));
             return False;
@@ -2617,7 +2617,7 @@ HandleComplexKey(KeyDef * def, KeyInfo * key, GeometryInfo * info)
             else
             {
                 ERROR("Illegal element used in a key definition\n");
-                ACTION2("Assignment to %s.%s ignored\n", elem.str, f.str);
+                ACTION("Assignment to %s.%s ignored\n", elem.str, f.str);
                 return False;
             }
         }
@@ -2640,7 +2640,7 @@ HandleComplexKey(KeyDef * def, KeyInfo * key, GeometryInfo * info)
                 break;
             default:
                 ERROR("Cannot determine field for unnamed expression\n");
-                ACTION3("Ignoring key %d in row %d of section %s\n",
+                ACTION("Ignoring key %d in row %d of section %s\n",
                         row->nKeys + 1, row->section->nRows + 1,
                         rowText(info->dpy, row));
                 return False;
@@ -2658,7 +2658,7 @@ HandleRowBody(RowDef * def, RowInfo * row, unsigned merge,
 
     if ((def->nKeys < 1) && (warningLevel > 3))
     {
-        ERROR1("Row in section %s has no keys\n", rowText(info->dpy, row));
+        ERROR("Row in section %s has no keys\n", rowText(info->dpy, row));
         ACTION("Section ignored\n");
         return True;
     }
@@ -2686,7 +2686,7 @@ HandleRowBody(RowDef * def, RowInfo * row, unsigned merge,
             else
             {
                 WARN("Assignment to field of unknown element in row\n");
-                ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+                ACTION("No value assigned to %s.%s\n", elem.str, field.str);
             }
         }
         else if (keyDef->common.stmtType == StmtKeyDef)
@@ -2698,7 +2698,7 @@ HandleRowBody(RowDef * def, RowInfo * row, unsigned merge,
                 int len = strlen(keyDef->name);
                 if ((len < 1) || (len > XkbKeyNameLength))
                 {
-                    ERROR2("Illegal name %s for key in section %s\n",
+                    ERROR("Illegal name %s for key in section %s\n",
                            keyDef->name, rowText(info->dpy, row));
                     ACTION("Section not compiled\n");
                     return False;
@@ -2714,7 +2714,7 @@ HandleRowBody(RowDef * def, RowInfo * row, unsigned merge,
         }
         else
         {
-            WSGO1("Unexpected statement (type %d) in row body\n",
+            WSGO("Unexpected statement (type %d) in row body\n",
                   keyDef->common.stmtType);
             return False;
         }
@@ -2765,7 +2765,7 @@ HandleSectionBody(SectionDef * def,
             else
             {
                 WARN("Assignment to field of unknown element in section\n");
-                ACTION2("No value assigned to %s.%s\n", elem.str, field.str);
+                ACTION("No value assigned to %s.%s\n", elem.str, field.str);
             }
         }
         else if (rowDef->common.stmtType == StmtRowDef)
@@ -2791,16 +2791,16 @@ HandleSectionBody(SectionDef * def,
         }
         else
         {
-            WSGO1("Unexpected statement (type %d) in section body\n",
+            WSGO("Unexpected statement (type %d) in section body\n",
                   rowDef->common.stmtType);
             return False;
         }
     }
     if (si->nRows != def->nRows)
     {
-        WSGO2("Expected %d rows, found %d\n", (unsigned int) def->nRows,
+        WSGO("Expected %d rows, found %d\n", (unsigned int) def->nRows,
               (unsigned int) si->nRows);
-        ACTION1("Definition of section %s might be incorrect\n",
+        ACTION("Definition of section %s might be incorrect\n",
                 scText(info->dpy, si));
     }
     return True;
@@ -2893,11 +2893,11 @@ HandleGeometryFile(XkbFile * file,
             if (!failWhat)
                 failWhat = "key name";
             ERROR("Interpretation files may not include other types\n");
-            ACTION1("Ignoring %s definition.\n", failWhat);
+            ACTION("Ignoring %s definition.\n", failWhat);
             info->errorCount++;
             break;
         default:
-            WSGO1("Unexpected statement type %d in HandleGeometryFile\n",
+            WSGO("Unexpected statement type %d in HandleGeometryFile\n",
                   stmt->stmtType);
             break;
         }
@@ -2907,7 +2907,7 @@ HandleGeometryFile(XkbFile * file,
 #ifdef NOISY
             ERROR("Too many errors\n");
 #endif
-            ACTION1("Abandoning geometry file \"%s\"\n", file->topName);
+            ACTION("Abandoning geometry file \"%s\"\n", file->topName);
             break;
         }
     }
@@ -2930,7 +2930,7 @@ CopyShapeDef(Display * dpy, XkbGeometryPtr geom, ShapeInfo * si)
     if (!shape)
     {
         WSGO("Couldn't allocate shape in geometry\n");
-        ACTION1("Shape %s not compiled\n", shText(dpy, si));
+        ACTION("Shape %s not compiled\n", shText(dpy, si));
         return False;
     }
     old_outline = si->outlines;
@@ -2940,7 +2940,7 @@ CopyShapeDef(Display * dpy, XkbGeometryPtr geom, ShapeInfo * si)
         if (!outline)
         {
             WSGO("Couldn't allocate outline in shape\n");
-            ACTION1("Shape %s is incomplete\n", shText(dpy, si));
+            ACTION("Shape %s is incomplete\n", shText(dpy, si));
             return False;
         }
         n = old_outline->num_points;
@@ -2969,7 +2969,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     {
         if (warningLevel < 9)
         {
-            ERROR1("No position defined for doodad %s\n",
+            ERROR("No position defined for doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Illegal doodad ignored\n");
             return False;
@@ -2985,7 +2985,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     case XkbSolidDoodad:
         if ((di->defs.defined & _GD_Shape) == 0)
         {
-            ERROR2("No shape defined for %s doodad %s\n",
+            ERROR("No shape defined for %s doodad %s\n",
                    (di->type == XkbOutlineDoodad ? "outline" : "filled"),
                    ddText(info->dpy, di));
             ACTION("Incomplete definition ignored\n");
@@ -3002,7 +3002,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
                 di->shape = si->name;
             else
             {
-                ERROR1("No legal shape for %s\n", ddText(info->dpy, di));
+                ERROR("No legal shape for %s\n", ddText(info->dpy, di));
                 ACTION("Incomplete definition ignored\n");
                 return False;
             }
@@ -3011,7 +3011,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No color for doodad %s\n", ddText(info->dpy, di));
+                WARN("No color for doodad %s\n", ddText(info->dpy, di));
                 ACTION("Using black\n");
             }
             di->color = XkbInternAtom(NULL, "black", False);
@@ -3020,7 +3020,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     case XkbTextDoodad:
         if ((di->defs.defined & _GD_Text) == 0)
         {
-            ERROR1("No text specified for text doodad %s\n",
+            ERROR("No text specified for text doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Illegal doodad definition ignored\n");
             return False;
@@ -3031,7 +3031,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No color specified for doodad %s\n",
+                WARN("No color specified for doodad %s\n",
                       ddText(info->dpy, di));
                 ACTION("Using black\n");
             }
@@ -3043,7 +3043,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
                 return True;
             if (warningLevel < 9)
             {
-                WARN1
+                WARN
                     ("Text doodad %s has full and partial font definition\n",
                      ddText(info->dpy, di));
                 ACTION("Full specification ignored\n");
@@ -3055,9 +3055,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No font specified for doodad %s\n",
+                WARN("No font specified for doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_FONT);
+                ACTION("Using \"%s\"\n", DFLT_FONT);
             }
             di->font = XkbInternAtom(NULL, DFLT_FONT, False);
         }
@@ -3065,9 +3065,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 7)
             {
-                WARN1("No font slant for text doodad %s\n",
+                WARN("No font slant for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_SLANT);
+                ACTION("Using \"%s\"\n", DFLT_SLANT);
             }
             di->fontSlant = XkbInternAtom(NULL, DFLT_SLANT, False);
         }
@@ -3075,9 +3075,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 7)
             {
-                WARN1("No font weight for text doodad %s\n",
+                WARN("No font weight for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_WEIGHT);
+                ACTION("Using \"%s\"\n", DFLT_WEIGHT);
             }
             di->fontWeight = XkbInternAtom(NULL, DFLT_WEIGHT, False);
         }
@@ -3085,9 +3085,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 9)
             {
-                WARN1("No font set width for text doodad %s\n",
+                WARN("No font set width for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_SET_WIDTH);
+                ACTION("Using \"%s\"\n", DFLT_SET_WIDTH);
             }
             di->fontSetWidth = XkbInternAtom(NULL, DFLT_SET_WIDTH, False);
         }
@@ -3095,9 +3095,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 9)
             {
-                WARN1("No font variant for text doodad %s\n",
+                WARN("No font variant for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_VARIANT);
+                ACTION("Using \"%s\"\n", DFLT_VARIANT);
             }
             di->fontVariant = XkbInternAtom(NULL, DFLT_VARIANT, False);
         }
@@ -3105,9 +3105,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 7)
             {
-                WARN1("No font encoding for doodad %s\n",
+                WARN("No font encoding for doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using \"%s\"\n", DFLT_ENCODING);
+                ACTION("Using \"%s\"\n", DFLT_ENCODING);
             }
             di->fontEncoding = XkbInternAtom(NULL, DFLT_ENCODING, False);
         }
@@ -3115,9 +3115,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 7)
             {
-                WARN1("No font size for text doodad %s\n",
+                WARN("No font size for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using %s point text\n",
+                ACTION("Using %s point text\n",
                         XkbGeomFPText(DFLT_SIZE, XkbMessage));
             }
             di->fontSize = DFLT_SIZE;
@@ -3137,9 +3137,9 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
             size *= nLines;
             if (warningLevel > 5)
             {
-                WARN1("No height for text doodad %s\n",
+                WARN("No height for text doodad %s\n",
                       ddText(info->dpy, di));
-                ACTION1("Using calculated height %s millimeters\n",
+                ACTION("Using calculated height %s millimeters\n",
                         XkbGeomFPText(size, XkbMessage));
             }
             di->height = size;
@@ -3165,8 +3165,8 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
             width *= (di->height * 2) / 3;
             if (warningLevel > 5)
             {
-                WARN1("No width for text doodad %s\n", ddText(info->dpy, di));
-                ACTION1("Using calculated width %s millimeters\n",
+                WARN("No width for text doodad %s\n", ddText(info->dpy, di));
+                ACTION("Using calculated width %s millimeters\n",
                         XkbGeomFPText(width, XkbMessage));
             }
             di->width = width;
@@ -3175,7 +3175,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     case XkbIndicatorDoodad:
         if ((di->defs.defined & _GD_Shape) == 0)
         {
-            ERROR1("No shape defined for indicator doodad %s\n",
+            ERROR("No shape defined for indicator doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Incomplete definition ignored\n");
             return False;
@@ -3189,7 +3189,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
                 di->shape = si->name;
             else
             {
-                ERROR1("No legal shape for doodad %s\n",
+                ERROR("No legal shape for doodad %s\n",
                        ddText(info->dpy, di));
                 ACTION("Incomplete definition ignored\n");
                 return False;
@@ -3199,7 +3199,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No \"on\" color for indicator doodad %s\n",
+                WARN("No \"on\" color for indicator doodad %s\n",
                       ddText(info->dpy, di));
                 ACTION("Using green\n");
             }
@@ -3209,7 +3209,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No \"off\" color for indicator doodad %s\n",
+                WARN("No \"off\" color for indicator doodad %s\n",
                       ddText(info->dpy, di));
                 ACTION("Using black\n");
             }
@@ -3219,14 +3219,14 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
     case XkbLogoDoodad:
         if (di->logoName == NULL)
         {
-            ERROR1("No logo name defined for logo doodad %s\n",
+            ERROR("No logo name defined for logo doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Incomplete definition ignored\n");
             return False;
         }
         if ((di->defs.defined & _GD_Shape) == 0)
         {
-            ERROR1("No shape defined for logo doodad %s\n",
+            ERROR("No shape defined for logo doodad %s\n",
                    ddText(info->dpy, di));
             ACTION("Incomplete definition ignored\n");
             return False;
@@ -3240,7 +3240,7 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
                 di->shape = si->name;
             else
             {
-                ERROR1("No legal shape for %s\n", ddText(info->dpy, di));
+                ERROR("No legal shape for %s\n", ddText(info->dpy, di));
                 ACTION("Incomplete definition ignored\n");
                 return False;
             }
@@ -3249,14 +3249,14 @@ VerifyDoodadInfo(DoodadInfo * di, GeometryInfo * info)
         {
             if (warningLevel > 5)
             {
-                WARN1("No color for doodad %s\n", ddText(info->dpy, di));
+                WARN("No color for doodad %s\n", ddText(info->dpy, di));
                 ACTION("Using black\n");
             }
             di->color = XkbInternAtom(NULL, "black", False);
         }
         break;
     default:
-        WSGO1("Unknown doodad type %d in VerifyDoodad\n",
+        WSGO("Unknown doodad type %d in VerifyDoodad\n",
               (unsigned int) di->type);
         return False;
     }
@@ -3318,9 +3318,9 @@ CopyDoodadDef(XkbGeometryPtr geom,
     doodad = XkbAddGeomDoodad(geom, section, name);
     if (!doodad)
     {
-        WSGO1("Couldn't allocate doodad in %s\n",
+        WSGO("Couldn't allocate doodad in %s\n",
               (section ? "section" : "geometry"));
-        ACTION1("Cannot copy doodad %s\n", ddText(info->dpy, di));
+        ACTION("Cannot copy doodad %s\n", ddText(info->dpy, di));
         return False;
     }
     doodad->any.type = di->type;
@@ -3423,7 +3423,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom,
                 {
                     if (warningLevel > 0)
                     {
-                        WARN3
+                        WARN
                             ("Key %s in section \"%s\" and overlay \"%s\"\n",
                              XkbKeyNameText(key->name.name,
                                             XkbMessage),
@@ -3443,7 +3443,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom,
         }
         if ((ki->sectionRow == _GOK_UnknownRow) && (warningLevel > 0))
         {
-            WARN3
+            WARN
                 ("Key %s not in \"%s\", but has an overlay key in \"%s\"\n",
                  XkbKeyNameText(ki->under, XkbMessage),
                  XkbAtomText(info->dpy, section->name, XkbMessage),
@@ -3472,7 +3472,7 @@ VerifyOverlayInfo(XkbGeometryPtr geom,
     }
     if (oi->nKeys < 1)
     {
-        ERROR2("Overlay \"%s\" for section \"%s\" has no legal keys\n",
+        ERROR("Overlay \"%s\" for section \"%s\" has no legal keys\n",
                XkbAtomText(info->dpy, oi->name, XkbMessage),
                XkbAtomText(info->dpy, section->name, XkbMessage));
         ACTION("Overlay definition ignored\n");
@@ -3513,7 +3513,7 @@ CopyOverlayDef(XkbGeometryPtr geom,
     ol = XkbAddGeomOverlay(section, name, oi->nRows);
     if (!ol)
     {
-        WSGO2("Couldn't add overlay \"%s\" to section \"%s\"\n",
+        WSGO("Couldn't add overlay \"%s\" to section \"%s\"\n",
               XkbAtomText(info->dpy, name, XkbMessage),
               XkbAtomText(info->dpy, section->name, XkbMessage));
         return False;
@@ -3529,7 +3529,7 @@ CopyOverlayDef(XkbGeometryPtr geom,
         }
         if (!XkbAddGeomOverlayRow(ol, row_under, rowSize[i]))
         {
-            WSGO3
+            WSGO
                 ("Can't add row %d to overlay \"%s\" of section \"%s\"\n",
                  i, XkbAtomText(info->dpy, name, XkbMessage),
                  XkbAtomText(info->dpy, section->name, XkbMessage));
@@ -3565,7 +3565,7 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info)
     if (section == NULL)
     {
         WSGO("Couldn't allocate section in geometry\n");
-        ACTION1("Section %s not compiled\n", scText(info->dpy, si));
+        ACTION("Section %s not compiled\n", scText(info->dpy, si));
         return False;
     }
     section->top = si->top;
@@ -3580,7 +3580,7 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info)
         if (row == NULL)
         {
             WSGO("Couldn't allocate row in section\n");
-            ACTION1("Section %s is incomplete\n", scText(info->dpy, si));
+            ACTION("Section %s is incomplete\n", scText(info->dpy, si));
             return False;
         }
         row->top = ri->top;
@@ -3591,17 +3591,17 @@ CopySectionDef(XkbGeometryPtr geom, SectionInfo * si, GeometryInfo * info)
             XkbColorPtr color;
             if ((ki->defs.defined & _GK_Name) == 0)
             {
-                ERROR3("Key %d of row %d in section %s has no name\n",
+                ERROR("Key %d of row %d in section %s has no name\n",
                        (int) ki->index, (int) ri->index,
                        scText(info->dpy, si));
-                ACTION1("Section %s ignored\n", scText(info->dpy, si));
+                ACTION("Section %s ignored\n", scText(info->dpy, si));
                 return False;
             }
             key = XkbAddGeomKey(row);
             if (key == NULL)
             {
                 WSGO("Couldn't allocate key in row\n");
-                ACTION1("Section %s is incomplete\n", scText(info->dpy, si));
+                ACTION("Section %s is incomplete\n", scText(info->dpy, si));
                 return False;
             }
             memcpy(key->name.name, ki->name, XkbKeyNameLength);
diff --git a/app/xkbcomp/indicators.c b/app/xkbcomp/indicators.c
index 421ad583d..0beb2d66d 100644
--- a/app/xkbcomp/indicators.c
+++ b/app/xkbcomp/indicators.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -83,7 +83,7 @@ AddIndicatorMap(LEDInfo * oldLEDs, LEDInfo * new)
                 if (((old->defs.fileID == new->defs.fileID)
                      && (warningLevel > 0)) || (warningLevel > 9))
                 {
-                    WARN1("Map for indicator %s redefined\n",
+                    WARN("Map for indicator %s redefined\n",
                           XkbAtomText(NULL, old->name, XkbMessage));
                     ACTION("Earlier definition ignored\n");
                 }
@@ -135,9 +135,9 @@ AddIndicatorMap(LEDInfo * oldLEDs, LEDInfo * new)
             }
             if (collide)
             {
-                WARN1("Map for indicator %s redefined\n",
+                WARN("Map for indicator %s redefined\n",
                       XkbAtomText(NULL, old->name, XkbMessage));
-                ACTION1("Using %s definition for duplicate fields\n",
+                ACTION("Using %s definition for duplicate fields\n",
                         (new->defs.merge == MergeAugment ? "first" : "last"));
             }
             return oldLEDs;
@@ -150,7 +150,7 @@ AddIndicatorMap(LEDInfo * oldLEDs, LEDInfo * new)
     if (!old)
     {
         WSGO("Couldn't allocate indicator map\n");
-        ACTION1("Map for indicator %s not compiled\n",
+        ACTION("Map for indicator %s not compiled\n",
                 XkbAtomText(NULL, new->name, XkbMessage));
         return NULL;
     }
@@ -303,9 +303,9 @@ SetIndicatorMapField(LEDInfo * led,
                                           "indicator index");
         if ((rtrn.uval < 1) || (rtrn.uval > 32))
         {
-            ERROR2("Illegal indicator index %d (range 1..%d)\n",
+            ERROR("Illegal indicator index %d (range 1..%d)\n",
                    rtrn.uval, XkbNumIndicators);
-            ACTION1("Index definition for %s indicator ignored\n",
+            ACTION("Index definition for %s indicator ignored\n",
                     XkbAtomText(NULL, led->name, XkbMessage));
             return False;
         }
@@ -314,7 +314,7 @@ SetIndicatorMapField(LEDInfo * led,
     }
     else
     {
-        ERROR2("Unknown field %s in map for %s indicator\n", field,
+        ERROR("Unknown field %s in map for %s indicator\n", field,
                XkbAtomText(NULL, led->name, XkbMessage));
         ACTION("Definition ignored\n");
         ok = False;
@@ -350,10 +350,10 @@ HandleIndicatorMapDef(IndicatorMapDef * def,
         }
         if (elem.str != NULL)
         {
-            ERROR1
+            ERROR
                 ("Cannot set defaults for \"%s\" element in indicator map\n",
                  elem.str);
-            ACTION2("Assignment to %s.%s ignored\n", elem.str, field.str);
+            ACTION("Assignment to %s.%s ignored\n", elem.str, field.str);
             ok = False;
         }
         else
@@ -484,7 +484,7 @@ BindIndicators(XkbFileInfo * result,
                     if (led->indicator == _LED_NotBound)
                     {
                         ERROR("No unnamed indicators found\n");
-                        ACTION1
+                        ACTION
                             ("Virtual indicator map \"%s\" not bound\n",
                              XkbAtomGetString(xkb->dpy, led->name));
                         continue;
@@ -518,9 +518,9 @@ BindIndicators(XkbFileInfo * result,
                 (xkb->names->indicators[led->indicator - 1] != led->name))
             {
                 Atom old = xkb->names->indicators[led->indicator - 1];
-                ERROR1("Multiple names bound to indicator %d\n",
+                ERROR("Multiple names bound to indicator %d\n",
                        (unsigned int) led->indicator);
-                ACTION2("Using %s, ignoring %s\n",
+                ACTION("Using %s, ignoring %s\n",
                         XkbAtomGetString(xkb->dpy, old),
                         XkbAtomGetString(xkb->dpy, led->name));
                 led->indicator = _LED_NotBound;
diff --git a/app/xkbcomp/indicators.h b/app/xkbcomp/indicators.h
index 8e7884d7c..6bf6111e7 100644
--- a/app/xkbcomp/indicators.h
+++ b/app/xkbcomp/indicators.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/keycodes.c b/app/xkbcomp/keycodes.c
index c9d889ffe..4a8973c95 100644
--- a/app/xkbcomp/keycodes.c
+++ b/app/xkbcomp/keycodes.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -169,7 +169,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple indicators named %s\n",
+            WARN("Multiple indicators named %s\n",
                   XkbAtomText(NULL, new->name, XkbMessage));
             if (old->ndx == new->ndx)
             {
@@ -177,7 +177,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
                 {
                     if (replace)
                         old->virtual = new->virtual;
-                    ACTION2("Using %s instead of %s\n",
+                    ACTION("Using %s instead of %s\n",
                             (old->virtual ? "virtual" : "real"),
                             (old->virtual ? "real" : "virtual"));
                 }
@@ -190,9 +190,9 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
             else
             {
                 if (replace)
-                    ACTION2("Ignoring %d, using %d\n", old->ndx, new->ndx);
+                    ACTION("Ignoring %d, using %d\n", old->ndx, new->ndx);
                 else
-                    ACTION2("Using %d, ignoring %d\n", old->ndx, new->ndx);
+                    ACTION("Using %d, ignoring %d\n", old->ndx, new->ndx);
             }
             if (replace)
             {
@@ -222,7 +222,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
         if (((old->defs.fileID == new->defs.fileID) && (warningLevel > 0))
             || (warningLevel > 9))
         {
-            WARN1("Multiple names for indicator %d\n", new->ndx);
+            WARN("Multiple names for indicator %d\n", new->ndx);
             if ((old->name == new->name) && (old->virtual == new->virtual))
                 ACTION("Identical definitions ignored\n");
             else
@@ -247,7 +247,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
                     using = old->name;
                     ignoring = new->name;
                 }
-                ACTION4("Using %s %s, ignoring %s %s\n",
+                ACTION("Using %s %s, ignoring %s %s\n",
                         oldType, XkbAtomText(NULL, using, XkbMessage),
                         newType, XkbAtomText(NULL, ignoring, XkbMessage));
             }
@@ -263,7 +263,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
     new = NextIndicatorName(info);
     if (!new)
     {
-        WSGO1("Couldn't allocate name for indicator %d\n", old->ndx);
+        WSGO("Couldn't allocate name for indicator %d\n", old->ndx);
         ACTION("Ignored\n");
         return False;
     }
@@ -334,10 +334,8 @@ AddKeyName(KeyNamesInfo * info,
     {
         if (!high_keycode_warned && warningLevel > 1)
         {
-            WARN2("Unsupported high keycode %d for name <%s> ignored\n",
+            INFO("Keycodes above %d (e.g. <%s>) are not supported by X and are ignored\n",
                   kc, name);
-            ACTION2("X11 cannot support keycodes above 255.\n");
-            ACTION2("This warning only shows for the first high keycode.\n");
             high_keycode_warned = True;
         }
         return True;
@@ -370,7 +368,7 @@ AddKeyName(KeyNamesInfo * info,
             else if (reportCollisions)
             {
                 WARN("Multiple identical key name definitions\n");
-                ACTION2("Later occurrences of \"<%s> = %d\" ignored\n",
+                ACTION("Later occurrences of \"<%s> = %d\" ignored\n",
                         buf, kc);
             }
             return True;
@@ -379,8 +377,8 @@ AddKeyName(KeyNamesInfo * info,
         {
             if (reportCollisions)
             {
-                WARN1("Multiple names for keycode %d\n", kc);
-                ACTION2("Using <%s>, ignoring <%s>\n", buf, name);
+                WARN("Multiple names for keycode %d\n", kc);
+                ACTION("Using <%s>, ignoring <%s>\n", buf, name);
             }
             return True;
         }
@@ -388,8 +386,8 @@ AddKeyName(KeyNamesInfo * info,
         {
             if (reportCollisions)
             {
-                WARN1("Multiple names for keycode %d\n", kc);
-                ACTION2("Using <%s>, ignoring <%s>\n", name, buf);
+                WARN("Multiple names for keycode %d\n", kc);
+                ACTION("Using <%s>, ignoring <%s>\n", name, buf);
             }
             info->names[kc] = 0;
             info->files[kc] = 0;
@@ -405,16 +403,16 @@ AddKeyName(KeyNamesInfo * info,
             info->has_alt_forms[old] = True;
             if (reportCollisions)
             {
-                WARN1("Key name <%s> assigned to multiple keys\n", name);
-                ACTION2("Using %d, ignoring %d\n", kc, old);
+                WARN("Key name <%s> assigned to multiple keys\n", name);
+                ACTION("Using %d, ignoring %d\n", kc, old);
             }
         }
         else if (merge != MergeAltForm)
         {
             if ((reportCollisions) && (warningLevel > 3))
             {
-                WARN1("Key name <%s> assigned to multiple keys\n", name);
-                ACTION2("Using %d, ignoring %d\n", old, kc);
+                WARN("Key name <%s> assigned to multiple keys\n", name);
+                ACTION("Using %d, ignoring %d\n", old, kc);
                 ACTION
                     ("Use 'alternate' keyword to assign the same name to multiple keys\n");
             }
@@ -590,7 +588,7 @@ HandleKeycodeDef(KeycodeDef * stmt, unsigned merge, KeyNamesInfo * info)
 
     if (!ExprResolveInteger(stmt->value, &result, NULL, NULL))
     {
-        ACTION1("No value keycode assigned to name <%s>\n", stmt->name);
+        ACTION("No value keycode assigned to name <%s>\n", stmt->name);
         return 0;
     }
     code = result.ival;
@@ -598,10 +596,8 @@ HandleKeycodeDef(KeycodeDef * stmt, unsigned merge, KeyNamesInfo * info)
     {
         if (!high_keycode_warned && warningLevel > 1)
         {
-            WARN2("Unsupported high keycode %d for name <%s> ignored\n",
+            INFO("Keycodes above %d (e.g. <%s>) are not supported by X and are ignored\n",
                   code, stmt->name);
-            ACTION2("X11 cannot support keycodes above 255.\n");
-            ACTION2("This warning only shows for the first high keycode.\n");
             high_keycode_warned = True;
         }
         return 1;
@@ -637,8 +633,8 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info)
 
     if (tmp.str != NULL)
     {
-        ERROR1("Unknown element %s encountered\n", tmp.str);
-        ACTION1("Default for field %s ignored\n", field.str);
+        ERROR("Unknown element %s encountered\n", tmp.str);
+        ACTION("Default for field %s ignored\n", field.str);
         return 0;
     }
     if (uStrCaseCmp(field.str, "minimum") == 0)
@@ -648,33 +644,33 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info)
     else
     {
         ERROR("Unknown field encountered\n");
-        ACTION1("Assignment to field %s ignored\n", field.str);
+        ACTION("Assignment to field %s ignored\n", field.str);
         return 0;
     }
     if (arrayNdx != NULL)
     {
-        ERROR1("The %s setting is not an array\n", field.str);
+        ERROR("The %s setting is not an array\n", field.str);
         ACTION("Illegal array reference ignored\n");
         return 0;
     }
 
     if (ExprResolveInteger(stmt->value, &tmp, NULL, NULL) == 0)
     {
-        ACTION1("Assignment to field %s ignored\n", field.str);
+        ACTION("Assignment to field %s ignored\n", field.str);
         return 0;
     }
     if ((tmp.ival < XkbMinLegalKeyCode))
     {
-        ERROR3
+        ERROR
             ("Illegal keycode %d (must be in the range %d-%d inclusive)\n",
              tmp.ival, XkbMinLegalKeyCode, XkbMaxLegalKeyCode);
-        ACTION1("Value of \"%s\" not changed\n", field.str);
+        ACTION("Value of \"%s\" not changed\n", field.str);
         return 0;
     }
     if ((tmp.ival > XkbMaxLegalKeyCode))
     {
-        WARN2("Unsupported maximum keycode %d, clipping.\n", tmp.ival);
-        ACTION2("X11 cannot support keycodes above 255.\n");
+        WARN("Unsupported maximum keycode %d, clipping.\n", tmp.ival);
+        ACTION("X11 cannot support keycodes above 255.\n");
         info->explicitMax = XkbMaxLegalKeyCode;
         info->effectiveMax = XkbMaxLegalKeyCode;
         return 1;
@@ -683,7 +679,7 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info)
     {
         if ((info->explicitMax > 0) && (info->explicitMax < tmp.ival))
         {
-            ERROR2
+            ERROR
                 ("Minimum key code (%d) must be <= maximum key code (%d)\n",
                  tmp.ival, info->explicitMax);
             ACTION("Minimum key code value not changed\n");
@@ -691,7 +687,7 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info)
         }
         if ((info->computedMax > 0) && (info->computedMin < tmp.ival))
         {
-            ERROR2
+            ERROR
                 ("Minimum key code (%d) must be <= lowest defined key (%d)\n",
                  tmp.ival, info->computedMin);
             ACTION("Minimum key code value not changed\n");
@@ -704,14 +700,14 @@ HandleKeyNameVar(VarDef * stmt, KeyNamesInfo * info)
     {
         if ((info->explicitMin > 0) && (info->explicitMin > tmp.ival))
         {
-            ERROR2("Maximum code (%d) must be >= minimum key code (%d)\n",
+            ERROR("Maximum code (%d) must be >= minimum key code (%d)\n",
                    tmp.ival, info->explicitMin);
             ACTION("Maximum code value not changed\n");
             return 0;
         }
         if ((info->computedMax > 0) && (info->computedMax > tmp.ival))
         {
-            ERROR2
+            ERROR
                 ("Maximum code (%d) must be >= highest defined key (%d)\n",
                  tmp.ival, info->computedMax);
             ACTION("Maximum code value not changed\n");
@@ -733,7 +729,7 @@ HandleIndicatorNameDef(IndicatorNameDef * def,
     if ((def->ndx < 1) || (def->ndx > XkbNumIndicators))
     {
         info->errorCount++;
-        ERROR1("Name specified for illegal indicator index %d\n", def->ndx);
+        ERROR("Name specified for illegal indicator index %d\n", def->ndx);
         ACTION("Ignored\n");
         return False;
     }
@@ -805,14 +801,14 @@ HandleKeycodesFile(XkbFile * file,
         case StmtInterpDef:
         case StmtVModDef:
             ERROR("Keycode files may define key and indicator names only\n");
-            ACTION1("Ignoring definition of %s\n",
+            ACTION("Ignoring definition of %s\n",
                     ((stmt->stmtType ==
                       StmtInterpDef) ? "a symbol interpretation" :
                      "virtual modifiers"));
             info->errorCount++;
             break;
         default:
-            WSGO1("Unexpected statement type %d in HandleKeycodesFile\n",
+            WSGO("Unexpected statement type %d in HandleKeycodesFile\n",
                   stmt->stmtType);
             break;
         }
@@ -822,7 +818,7 @@ HandleKeycodesFile(XkbFile * file,
 #ifdef NOISY
             ERROR("Too many errors\n");
 #endif
-            ACTION1("Abandoning keycodes file \"%s\"\n", file->topName);
+            ACTION("Abandoning keycodes file \"%s\"\n", file->topName);
             break;
         }
     }
diff --git a/app/xkbcomp/keycodes.h b/app/xkbcomp/keycodes.h
index 11f4460fe..64ec3a354 100644
--- a/app/xkbcomp/keycodes.h
+++ b/app/xkbcomp/keycodes.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/keymap.c b/app/xkbcomp/keymap.c
index a419d8c42..b373f433e 100644
--- a/app/xkbcomp/keymap.c
+++ b/app/xkbcomp/keymap.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -74,7 +74,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge)
         legal = XkmKeymapLegal;
         break;
     default:
-        ERROR1("Cannot compile %s alone into an XKM file\n",
+        ERROR("Cannot compile %s alone into an XKM file\n",
                XkbConfigText(mainType, XkbMessage));
         return False;
     }
@@ -87,7 +87,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge)
         file->topName = mainName;
         if ((have & (1 << file->type)) != 0)
         {
-            ERROR2("More than one %s section in a %s file\n",
+            ERROR("More than one %s section in a %s file\n",
                    XkbConfigText(file->type, XkbMessage),
                    XkbConfigText(mainType, XkbMessage));
             ACTION("All sections after the first ignored\n");
@@ -95,7 +95,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge)
         }
         else if ((1 << file->type) & (~legal))
         {
-            ERROR2("Cannot define %s in a %s file\n",
+            ERROR("Cannot define %s in a %s file\n",
                    XkbConfigText(file->type, XkbMessage),
                    XkbConfigText(mainType, XkbMessage));
             ok = False;
@@ -106,7 +106,7 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge)
             case XkmSemanticsFile:
             case XkmLayoutFile:
             case XkmKeymapFile:
-                WSGO2("Illegal %s configuration in a %s file\n",
+                WSGO("Illegal %s configuration in a %s file\n",
                       XkbConfigText(file->type, XkbMessage),
                       XkbConfigText(mainType, XkbMessage));
                 ACTION("Ignored\n");
@@ -130,11 +130,11 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge)
                 break;
             case XkmVirtualModsIndex:
             case XkmIndicatorsIndex:
-                WSGO1("Found an isolated %s section\n",
+                WSGO("Found an isolated %s section\n",
                       XkbConfigText(file->type, XkbMessage));
                 break;
             default:
-                WSGO1("Unknown file type %d\n", file->type);
+                WSGO("Unknown file type %d\n", file->type);
                 break;
             }
         if (ok)
@@ -168,13 +168,13 @@ CompileKeymap(XkbFile * file, XkbFileInfo * result, unsigned merge)
         {
             if (missing & bit)
             {
-                ERROR2("Missing %s section in a %s file\n",
+                ERROR("Missing %s section in a %s file\n",
                        XkbConfigText(i, XkbMessage),
                        XkbConfigText(mainType, XkbMessage));
                 missing &= ~bit;
             }
         }
-        ACTION1("Description of %s not compiled\n",
+        ACTION("Description of %s not compiled\n",
                 XkbConfigText(mainType, XkbMessage));
         ok = False;
     }
diff --git a/app/xkbcomp/keytypes.c b/app/xkbcomp/keytypes.c
index 9c8083c65..121280f3a 100644
--- a/app/xkbcomp/keytypes.c
+++ b/app/xkbcomp/keytypes.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -274,7 +274,7 @@ FindMatchingKeyType(KeyTypesInfo * info, KeyTypeInfo * new)
 static Bool
 ReportTypeBadWidth(const char *type, int has, int needs)
 {
-    ERROR3("Key type \"%s\" has %d levels, must have %d\n", type, has, needs);
+    ERROR("Key type \"%s\" has %d levels, must have %d\n", type, has, needs);
     ACTION("Illegal type definition ignored\n");
     return False;
 }
@@ -326,7 +326,7 @@ AddKeyType(XkbDescPtr xkb, KeyTypesInfo * info, KeyTypeInfo * new)
             if (((old->defs.fileID == new->defs.fileID)
                  && (warningLevel > 0)) || (warningLevel > 9))
             {
-                WARN1("Multiple definitions of the %s key type\n",
+                WARN("Multiple definitions of the %s key type\n",
                       XkbAtomGetString(NULL, new->name));
                 ACTION("Earlier definition ignored\n");
             }
@@ -342,7 +342,7 @@ AddKeyType(XkbDescPtr xkb, KeyTypesInfo * info, KeyTypeInfo * new)
         report = (old->defs.fileID == new->defs.fileID) && (warningLevel > 0);
         if (report)
         {
-            WARN1("Multiple definitions of the %s key type\n",
+            WARN("Multiple definitions of the %s key type\n",
                   XkbAtomGetString(NULL, new->name));
             ACTION("Later definition ignored\n");
         }
@@ -520,7 +520,7 @@ NextMapEntry(KeyTypeInfo * type)
         type->entries = uTypedCalloc(2, XkbKTMapEntryRec);
         if (type->entries == NULL)
         {
-            ERROR1("Couldn't allocate map entries for %s\n", TypeTxt(type));
+            ERROR("Couldn't allocate map entries for %s\n", TypeTxt(type));
             ACTION("Map entries lost\n");
             return NULL;
         }
@@ -535,7 +535,7 @@ NextMapEntry(KeyTypeInfo * type)
                                        XkbKTMapEntryRec);
         if (type->entries == NULL)
         {
-            ERROR1("Couldn't reallocate map entries for %s\n", TypeTxt(type));
+            ERROR("Couldn't reallocate map entries for %s\n", TypeTxt(type));
             ACTION("Map entries lost\n");
             return NULL;
         }
@@ -563,7 +563,7 @@ AddPreserve(XkbDescPtr xkb,
         {
             if (warningLevel > 9)
             {
-                WARN2("Identical definitions for preserve[%s] in %s\n",
+                WARN("Identical definitions for preserve[%s] in %s\n",
                       PreserveIndexTxt(type, xkb, old), TypeTxt(type));
                 ACTION("Ignored\n");
             }
@@ -572,19 +572,19 @@ AddPreserve(XkbDescPtr xkb,
         if (report && (warningLevel > 0))
         {
             char *str;
-            WARN2("Multiple definitions for preserve[%s] in %s\n",
+            WARN("Multiple definitions for preserve[%s] in %s\n",
                   PreserveIndexTxt(type, xkb, old), TypeTxt(type));
 
             if (clobber)
                 str = PreserveTxt(type, xkb, new);
             else
                 str = PreserveTxt(type, xkb, old);
-            ACTION1("Using %s, ", str);
+            ACTION("Using %s, ", str);
             if (clobber)
                 str = PreserveTxt(type, xkb, old);
             else
                 str = PreserveTxt(type, xkb, new);
-            INFO1("ignoring %s\n", str);
+            INFO("ignoring %s\n", str);
         }
         if (clobber)
         {
@@ -596,8 +596,8 @@ AddPreserve(XkbDescPtr xkb,
     old = uTypedAlloc(PreserveInfo);
     if (!old)
     {
-        WSGO1("Couldn't allocate preserve in %s\n", TypeTxt(type));
-        ACTION1("Preserve[%s] lost\n", PreserveIndexTxt(type, xkb, new));
+        WSGO("Couldn't allocate preserve in %s\n", TypeTxt(type));
+        ACTION("Preserve[%s] lost\n", PreserveIndexTxt(type, xkb, new));
         return False;
     }
     *old = *new;
@@ -638,13 +638,13 @@ AddMapEntry(XkbDescPtr xkb,
                 use = old->level + 1;
                 ignore = new->level + 1;
             }
-            WARN2("Multiple map entries for %s in %s\n",
+            WARN("Multiple map entries for %s in %s\n",
                   MapEntryTxt(type, xkb, new), TypeTxt(type));
-            ACTION2("Using %d, ignoring %d\n", use, ignore);
+            ACTION("Using %d, ignoring %d\n", use, ignore);
         }
         else if (warningLevel > 9)
         {
-            WARN3("Multiple occurrences of map[%s]= %d in %s\n",
+            WARN("Multiple occurrences of map[%s]= %d in %s\n",
                   MapEntryTxt(type, xkb, new), new->level + 1, TypeTxt(type));
             ACTION("Ignored\n");
             return True;
@@ -698,13 +698,13 @@ SetMapEntry(KeyTypeInfo * type,
     {
         if (warningLevel > 0)
         {
-            WARN1("Map entry for unused modifiers in %s\n", TypeTxt(type));
-            ACTION1("Using %s instead of ",
+            WARN("Map entry for unused modifiers in %s\n", TypeTxt(type));
+            ACTION("Using %s instead of ",
                     XkbVModMaskText(type->dpy, xkb,
                                     entry.mods.real_mods & type->mask,
                                     entry.mods.vmods & type->vmask,
                                     XkbMessage));
-            INFO1("%s\n", MapEntryTxt(type, xkb, &entry));
+            INFO("%s\n", MapEntryTxt(type, xkb, &entry));
         }
         entry.mods.real_mods &= type->mask;
         entry.mods.vmods &= type->vmask;
@@ -717,9 +717,9 @@ SetMapEntry(KeyTypeInfo * type,
     }
     if ((rtrn.ival < 1) || (rtrn.ival > XkbMaxShiftLevel + 1))
     {
-        ERROR3("Shift level %d out of range (1..%d) in key type %s\n",
+        ERROR("Shift level %d out of range (1..%d) in key type %s\n",
                XkbMaxShiftLevel + 1, rtrn.ival, TypeTxt(type));
-        ACTION1("Ignoring illegal definition of map[%s]\n",
+        ACTION("Ignoring illegal definition of map[%s]\n",
                 MapEntryTxt(type, xkb, &entry));
         return False;
     }
@@ -746,20 +746,20 @@ SetPreserve(KeyTypeInfo * type,
     {
         if (warningLevel > 0)
         {
-            WARN1("Preserve for modifiers not used by the %s type\n",
+            WARN("Preserve for modifiers not used by the %s type\n",
                   TypeTxt(type));
-            ACTION1("Index %s converted to ",
+            ACTION("Index %s converted to ",
                     PreserveIndexTxt(type, xkb, &new));
         }
         new.indexMods &= type->mask;
         new.indexVMods &= type->vmask;
         if (warningLevel > 0)
-            INFO1("%s\n", PreserveIndexTxt(type, xkb, &new));
+            INFO("%s\n", PreserveIndexTxt(type, xkb, &new));
     }
     if (!ExprResolveModMask(value, &rtrn, LookupVModMask, (XPointer) xkb))
     {
         ERROR("Preserve value in a key type is not a modifier mask\n");
-        ACTION2("Ignoring preserve[%s] in type %s\n",
+        ACTION("Ignoring preserve[%s] in type %s\n",
                 PreserveIndexTxt(type, xkb, &new), TypeTxt(type));
         return False;
     }
@@ -770,15 +770,15 @@ SetPreserve(KeyTypeInfo * type,
     {
         if (warningLevel > 0)
         {
-            WARN2("Illegal value for preserve[%s] in type %s\n",
+            WARN("Illegal value for preserve[%s] in type %s\n",
                   PreserveTxt(type, xkb, &new), TypeTxt(type));
-            ACTION1("Converted %s to ", PreserveIndexTxt(type, xkb, &new));
+            ACTION("Converted %s to ", PreserveIndexTxt(type, xkb, &new));
         }
         new.preMods &= new.indexMods;
         new.preVMods &= new.indexVMods;
         if (warningLevel > 0)
         {
-            INFO1("%s\n", PreserveIndexTxt(type, xkb, &new));
+            INFO("%s\n", PreserveIndexTxt(type, xkb, &new));
         }
     }
     return AddPreserve(xkb, type, &new, True, True);
@@ -796,7 +796,7 @@ AddLevelName(KeyTypeInfo * type,
             uTypedRecalloc(type->lvlNames, type->szNames, level + 1, Atom);
         if (type->lvlNames == NULL)
         {
-            ERROR1("Couldn't allocate level names for type %s\n",
+            ERROR("Couldn't allocate level names for type %s\n",
                    TypeTxt(type));
             ACTION("Level names lost\n");
             type->szNames = 0;
@@ -808,7 +808,7 @@ AddLevelName(KeyTypeInfo * type,
     {
         if (warningLevel > 9)
         {
-            WARN2("Duplicate names for level %d of key type %s\n",
+            WARN("Duplicate names for level %d of key type %s\n",
                   level + 1, TypeTxt(type));
             ACTION("Ignored\n");
         }
@@ -821,12 +821,12 @@ AddLevelName(KeyTypeInfo * type,
             char *old, *new;
             old = XkbAtomText(type->dpy, type->lvlNames[level], XkbMessage);
             new = XkbAtomText(type->dpy, name, XkbMessage);
-            WARN2("Multiple names for level %d of key type %s\n",
+            WARN("Multiple names for level %d of key type %s\n",
                   level + 1, TypeTxt(type));
             if (clobber)
-                ACTION2("Using %s, ignoring %s\n", new, old);
+                ACTION("Using %s, ignoring %s\n", new, old);
             else
-                ACTION2("Using %s, ignoring %s\n", old, new);
+                ACTION("Using %s, ignoring %s\n", old, new);
         }
         if (!clobber)
             return True;
@@ -849,7 +849,7 @@ SetLevelName(KeyTypeInfo * type, ExprDef * arrayNdx, ExprDef * value)
         return ReportTypeBadType(type, "level name", "integer");
     if ((rtrn.ival < 1) || (rtrn.ival > XkbMaxShiftLevel + 1))
     {
-        ERROR3("Level name %d out of range (1..%d) in key type %s\n",
+        ERROR("Level name %d out of range (1..%d) in key type %s\n",
                rtrn.ival,
                XkbMaxShiftLevel + 1,
                XkbAtomText(type->dpy, type->name, XkbMessage));
@@ -859,7 +859,7 @@ SetLevelName(KeyTypeInfo * type, ExprDef * arrayNdx, ExprDef * value)
     level = rtrn.ival - 1;
     if (!ExprResolveString(value, &rtrn, NULL, NULL))
     {
-        ERROR2("Non-string name for level %d in key type %s\n", level + 1,
+        ERROR("Non-string name for level %d in key type %s\n", level + 1,
                XkbAtomText(type->dpy, type->name, XkbMessage));
         ACTION("Ignoring illegal level name definition\n");
         return False;
@@ -903,10 +903,10 @@ SetKeyTypeField(KeyTypeInfo * type,
         vmods = (tmp.uval >> 8) & 0xffff; /* xkb virtual mods */
         if (type->defs.defined & _KT_Mask)
         {
-            WARN1("Multiple modifier mask definitions for key type %s\n",
+            WARN("Multiple modifier mask definitions for key type %s\n",
                   XkbAtomText(type->dpy, type->name, XkbMessage));
-            ACTION1("Using %s, ", TypeMaskTxt(type, xkb));
-            INFO1("ignoring %s\n", XkbVModMaskText(type->dpy, xkb, mods,
+            ACTION("Using %s, ", TypeMaskTxt(type, xkb));
+            INFO("ignoring %s\n", XkbVModMaskText(type->dpy, xkb, mods,
                                                    vmods, XkbMessage));
             return False;
         }
@@ -931,7 +931,7 @@ SetKeyTypeField(KeyTypeInfo * type,
         type->defs.defined |= _KT_LevelNames;
         return SetLevelName(type, arrayNdx, value);
     }
-    ERROR2("Unknown field %s in key type %s\n", field, TypeTxt(type));
+    ERROR("Unknown field %s in key type %s\n", field, TypeTxt(type));
     ACTION("Definition ignored\n");
     return False;
 }
@@ -949,12 +949,12 @@ HandleKeyTypeVar(VarDef * stmt, XkbDescPtr xkb, KeyTypesInfo * info)
                                stmt->value, info);
     if (elem.str != NULL)
     {
-        ERROR1("Default for unknown element %s\n", uStringText(elem.str));
-        ACTION1("Value for field %s ignored\n", uStringText(field.str));
+        ERROR("Default for unknown element %s\n", uStringText(elem.str));
+        ACTION("Value for field %s ignored\n", uStringText(field.str));
     }
     else if (field.str != NULL)
     {
-        ERROR1("Default defined for unknown field %s\n",
+        ERROR("Default defined for unknown field %s\n",
                uStringText(field.str));
         ACTION("Ignored\n");
     }
@@ -1114,7 +1114,7 @@ HandleKeyTypesFile(XkbFile * file,
             info->errorCount++;
             break;
         default:
-            WSGO1("Unexpected statement type %d in HandleKeyTypesFile\n",
+            WSGO("Unexpected statement type %d in HandleKeyTypesFile\n",
                   stmt->stmtType);
             break;
         }
@@ -1124,7 +1124,7 @@ HandleKeyTypesFile(XkbFile * file,
 #ifdef NOISY
             ERROR("Too many errors\n");
 #endif
-            ACTION1("Abandoning keytypes file \"%s\"\n", file->topName);
+            ACTION("Abandoning keytypes file \"%s\"\n", file->topName);
             break;
         }
     }
@@ -1166,7 +1166,7 @@ CopyDefToKeyType(XkbDescPtr xkb, XkbKeyTypePtr type, KeyTypeInfo * def)
         if (!type->preserve)
         {
             WARN("Couldn't allocate preserve array in CopyDefToKeyType\n");
-            ACTION1("Preserve setting for type %s lost\n",
+            ACTION("Preserve setting for type %s lost\n",
                     XkbAtomText(def->dpy, def->name, XkbMessage));
         }
         else
@@ -1228,7 +1228,7 @@ CompileKeyTypes(XkbFile * file, XkbFileInfo * result, unsigned merge)
             else
             {
                 WSGO("Couldn't allocate space for types name\n");
-                ACTION2("Name \"%s\" (from %s) NOT assigned\n",
+                ACTION("Name \"%s\" (from %s) NOT assigned\n",
                         scanFile, info.name);
             }
         }
diff --git a/app/xkbcomp/listing.c b/app/xkbcomp/listing.c
index 322cbf240..dc1cee9ae 100644
--- a/app/xkbcomp/listing.c
+++ b/app/xkbcomp/listing.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -52,13 +52,13 @@ Copyright 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
 
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of Digital not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -279,7 +279,7 @@ AddDirectory(char *head, char *ptrn, char *rest, char *map)
             tmp = strchr(tmp, ')');
             if ((tmp == NULL) || (tmp[1] != '\0'))
             {
-                ERROR1("File and map must have the format file(map)\n");
+                ERROR("File and map must have the format file(map)\n");
                 return 0;
             }
             *map = '\0';
@@ -388,7 +388,7 @@ AddMatchingFiles(char *head_in)
         || (head
             && ((strchr(head, '(') != NULL) || (strchr(head, ')') != NULL))))
     {
-        ERROR1("Files/maps to list must have the form file(map)\n");
+        ERROR("Files/maps to list must have the form file(map)\n");
         ACTION("Illegal specifier ignored\n");
         return 0;
     }
@@ -425,14 +425,14 @@ GenerateListing(char *out_name)
 
     if (nFilesListed < 1)
     {
-        ERROR1("Must specify at least one file or pattern to list\n");
+        ERROR("Must specify at least one file or pattern to list\n");
         return 0;
     }
     if ((!out_name) || ((out_name[0] == '-') && (out_name[1] == '\0')))
         outFile = stdout;
     else if ((outFile = fopen(out_name, "w")) == NULL)
     {
-        ERROR1("Cannot open \"%s\" to write keyboard description\n",
+        ERROR("Cannot open \"%s\" to write keyboard description\n",
                out_name);
         ACTION("Exiting\n");
         return 0;
@@ -460,7 +460,7 @@ GenerateListing(char *out_name)
             if (stat(list[i].file, &sbuf) < 0)
             {
                 if (oldWarningLevel > 5)
-                    WARN1("Couldn't open \"%s\"\n", list[i].file);
+                    WARN("Couldn't open \"%s\"\n", list[i].file);
                 continue;
             }
             if (S_ISDIR(sbuf.st_mode))
@@ -474,7 +474,7 @@ GenerateListing(char *out_name)
             if (!inputFile)
             {
                 if (oldWarningLevel > 5)
-                    WARN1("Couldn't open \"%s\"\n", list[i].file);
+                    WARN("Couldn't open \"%s\"\n", list[i].file);
                 continue;
             }
             setScanState(list[i].file, 1);
diff --git a/app/xkbcomp/misc.c b/app/xkbcomp/misc.c
index 848ed8c3e..5faa6c1cb 100644
--- a/app/xkbcomp/misc.c
+++ b/app/xkbcomp/misc.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -66,7 +66,7 @@ ProcessIncludeFile(IncludeStmt * stmt,
         file = XkbFindFileInPath(stmt->file, file_type, &stmt->path);
         if (file == NULL)
         {
-            ERROR2("Can't find file \"%s\" for %s include\n", stmt->file,
+            ERROR("Can't find file \"%s\" for %s include\n", stmt->file,
                    XkbDirectoryForInclude(file_type));
             ACTION("Exiting\n");
             return False;
@@ -75,12 +75,12 @@ ProcessIncludeFile(IncludeStmt * stmt,
         oldLine = lineNum;
         setScanState(stmt->file, 1);
         if (debugFlags & 2)
-            INFO1("About to parse include file %s\n", stmt->file);
+            INFO("About to parse include file %s\n", stmt->file);
         /* parse the file */
         if ((XKBParseFile(file, &rtrn) == 0) || (rtrn == NULL))
         {
             setScanState(oldFile, oldLine);
-            ERROR1("Error interpreting include file \"%s\"\n", stmt->file);
+            ERROR("Error interpreting include file \"%s\"\n", stmt->file);
             ACTION("Exiting\n");
             fclose(file);
             return False;
@@ -107,7 +107,7 @@ ProcessIncludeFile(IncludeStmt * stmt,
         }
         if (!mapToUse)
         {
-            ERROR3("No %s named \"%s\" in the include file \"%s\"\n",
+            ERROR("No %s named \"%s\" in the include file \"%s\"\n",
                    XkbConfigText(file_type, XkbMessage), stmt->map,
                    stmt->file);
             ACTION("Exiting\n");
@@ -124,9 +124,9 @@ ProcessIncludeFile(IncludeStmt * stmt,
         {
             if (warningLevel > 5)
             {
-                WARN1("No map in include statement, but \"%s\" contains several without a default map\n",
+                WARN("No map in include statement, but \"%s\" contains several without a default map\n",
                       stmt->file);
-                ACTION1("Using first defined map, \"%s\"\n", rtrn->name);
+                ACTION("Using first defined map, \"%s\"\n", rtrn->name);
             }
             mapToUse = rtrn;
         }
@@ -135,10 +135,10 @@ ProcessIncludeFile(IncludeStmt * stmt,
     setScanState(oldFile, oldLine);
     if (mapToUse->type != file_type)
     {
-        ERROR2("Include file wrong type (expected %s, got %s)\n",
+        ERROR("Include file wrong type (expected %s, got %s)\n",
                XkbConfigText(file_type, XkbMessage),
                XkbConfigText(mapToUse->type, XkbMessage));
-        ACTION1("Include file \"%s\" ignored\n", stmt->file);
+        ACTION("Include file \"%s\" ignored\n", stmt->file);
         return False;
     }
     /* FIXME: we have to check recursive includes here (or somewhere) */
@@ -154,16 +154,16 @@ ProcessIncludeFile(IncludeStmt * stmt,
 int
 ReportNotArray(const char *type, const char *field, const char *name)
 {
-    ERROR2("The %s %s field is not an array\n", type, field);
-    ACTION1("Ignoring illegal assignment in %s\n", name);
+    ERROR("The %s %s field is not an array\n", type, field);
+    ACTION("Ignoring illegal assignment in %s\n", name);
     return False;
 }
 
 int
 ReportShouldBeArray(const char *type, const char *field, char *name)
 {
-    ERROR2("Missing subscript for %s %s\n", type, field);
-    ACTION1("Ignoring illegal assignment in %s\n", name);
+    ERROR("Missing subscript for %s %s\n", type, field);
+    ACTION("Ignoring illegal assignment in %s\n", name);
     return False;
 }
 
@@ -171,31 +171,31 @@ int
 ReportBadType(const char *type, const char *field,
               const char *name, const char *wanted)
 {
-    ERROR3("The %s %s field must be a %s\n", type, field, wanted);
-    ACTION1("Ignoring illegal assignment in %s\n", name);
+    ERROR("The %s %s field must be a %s\n", type, field, wanted);
+    ACTION("Ignoring illegal assignment in %s\n", name);
     return False;
 }
 
 int
 ReportBadIndexType(char *type, char *field, char *name, char *wanted)
 {
-    ERROR3("Index for the %s %s field must be a %s\n", type, field, wanted);
-    ACTION1("Ignoring assignment to illegal field in %s\n", name);
+    ERROR("Index for the %s %s field must be a %s\n", type, field, wanted);
+    ACTION("Ignoring assignment to illegal field in %s\n", name);
     return False;
 }
 
 int
 ReportBadField(const char *type, const char *field, const char *name)
 {
-    ERROR3("Unknown %s field %s in %s\n", type, field, name);
-    ACTION1("Ignoring assignment to unknown field in %s\n", name);
+    ERROR("Unknown %s field %s in %s\n", type, field, name);
+    ACTION("Ignoring assignment to unknown field in %s\n", name);
     return False;
 }
 
 int
 ReportMultipleDefs(char *type, char *field, char *name)
 {
-    WARN3("Multiple definitions of %s in %s \"%s\"\n", field, type, name);
+    WARN("Multiple definitions of %s in %s \"%s\"\n", field, type, name);
     ACTION("Using last definition\n");
     return False;
 }
@@ -446,10 +446,10 @@ ComputeKbdDefaults(XkbDescPtr xkb)
                     {
                         if (warningLevel > 2)
                         {
-                            WARN1
+                            WARN
                                 ("Several keys match pattern for %s\n",
                                  XkbKeyNameText(name->name, XkbMessage));
-                            ACTION2("Using <U%03d> for key %d\n",
+                            ACTION("Using <U%03d> for key %d\n",
                                     nUnknown, i);
                         }
                         snprintf(tmpname, sizeof(tmpname), "U%03d",
@@ -464,8 +464,8 @@ ComputeKbdDefaults(XkbDescPtr xkb)
             {
                 if (warningLevel > 2)
                 {
-                    WARN1("Key %d does not match any defaults\n", i);
-                    ACTION1("Using name <U%03d>\n", nUnknown);
+                    WARN("Key %d does not match any defaults\n", i);
+                    ACTION("Using name <U%03d>\n", nUnknown);
                     snprintf(tmpname, sizeof(tmpname), "U%03d", nUnknown++);
                     memcpy(xkb->names->keys[i].name, tmpname,
                            XkbKeyNameLength);
@@ -539,7 +539,7 @@ FindNamedKey(XkbDescPtr xkb,
                 if (warningLevel > 0)
                 {
                     WARN("Couldn't allocate key names in FindNamedKey\n");
-                    ACTION1("Key \"%s\" not automatically created\n",
+                    ACTION("Key \"%s\" not automatically created\n",
                             longText(name, XkbMessage));
                 }
                 return False;
diff --git a/app/xkbcomp/misc.h b/app/xkbcomp/misc.h
index 4fa4b6dde..b6a5288d3 100644
--- a/app/xkbcomp/misc.h
+++ b/app/xkbcomp/misc.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/parseutils.c b/app/xkbcomp/parseutils.c
index 5f9f6a45e..4b77c4c60 100644
--- a/app/xkbcomp/parseutils.c
+++ b/app/xkbcomp/parseutils.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -719,7 +719,7 @@ IncludeCreate(char *str, unsigned merge)
         uFree(stmt);
     return first;
   BAIL:
-    ERROR1("Illegal include statement \"%s\"\n", stmt);
+    ERROR("Illegal include statement \"%s\"\n", stmt);
     ACTION("Ignored\n");
     while (first)
     {
@@ -776,9 +776,9 @@ CheckDefaultMap(XkbFile * maps)
             {
                 if (warningLevel > 2)
                 {
-                    WARN1("Multiple default components in %s\n",
+                    WARN("Multiple default components in %s\n",
                           (scanFile ? scanFile : "(unknown)"));
-                    ACTION2("Using %s, ignoring %s\n",
+                    ACTION("Using %s, ignoring %s\n",
                             (dflt->name ? dflt->name : "(first)"),
                             (tmp->name ? tmp->name : "(subsequent)"));
                 }
diff --git a/app/xkbcomp/parseutils.h b/app/xkbcomp/parseutils.h
index 8c381d408..5cc9391b5 100644
--- a/app/xkbcomp/parseutils.h
+++ b/app/xkbcomp/parseutils.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/symbols.c b/app/xkbcomp/symbols.c
index 9df736351..21c92be04 100644
--- a/app/xkbcomp/symbols.c
+++ b/app/xkbcomp/symbols.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -358,7 +358,7 @@ MergeKeyGroups(SymbolsInfo * info,
         if (!resultSyms)
         {
             WSGO("Could not allocate symbols for group merge\n");
-            ACTION2("Group %d of key %s not merged\n", group,
+            ACTION("Group %d of key %s not merged\n", group,
                     longText(into->name, XkbMessage));
             return False;
         }
@@ -369,7 +369,7 @@ MergeKeyGroups(SymbolsInfo * info,
         if (!resultActs)
         {
             WSGO("Could not allocate actions for group merge\n");
-            ACTION2("Group %d of key %s not merged\n", group,
+            ACTION("Group %d of key %s not merged\n", group,
                     longText(into->name, XkbMessage));
             return False;
         }
@@ -404,10 +404,10 @@ MergeKeyGroups(SymbolsInfo * info,
             }
             if (report)
             {
-                WARN3
+                WARN
                     ("Multiple symbols for level %d/group %d on key %s\n",
                      i + 1, group + 1, longText(into->name, XkbMessage));
-                ACTION2("Using %s, ignoring %s\n",
+                ACTION("Using %s, ignoring %s\n",
                         XkbKeysymText(use, XkbMessage),
                         XkbKeysymText(ignore, XkbMessage));
             }
@@ -443,10 +443,10 @@ MergeKeyGroups(SymbolsInfo * info,
                 }
                 if (report)
                 {
-                    WARN3
+                    WARN
                         ("Multiple actions for level %d/group %d on key %s\n",
                          i + 1, group + 1, longText(into->name, XkbMessage));
-                    ACTION2("Using %s, ignoring %s\n",
+                    ACTION("Using %s, ignoring %s\n",
                             XkbActionTypeText(use->type, XkbMessage),
                             XkbActionTypeText(ignore->type, XkbMessage));
                 }
@@ -548,10 +548,10 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from)
                     use = into->types[i];
                     ignore = from->types[i];
                 }
-                WARN2
+                WARN
                     ("Multiple definitions for group %d type of key %s\n",
                      i, longText(into->name, XkbMessage));
-                ACTION2("Using %s, ignoring %s\n",
+                ACTION("Using %s, ignoring %s\n",
                         XkbAtomText(NULL, use, XkbMessage),
                         XkbAtomText(NULL, ignore, XkbMessage));
             }
@@ -590,9 +590,9 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from)
     }
     if (collide)
     {
-        WARN1("Symbol map for key %s redefined\n",
+        WARN("Symbol map for key %s redefined\n",
               longText(into->name, XkbMessage));
-        ACTION1("Using %s definition for conflicting fields\n",
+        ACTION("Using %s definition for conflicting fields\n",
                 (from->defs.merge == MergeAugment ? "first" : "last"));
     }
     return True;
@@ -657,10 +657,10 @@ AddModMapEntry(SymbolsInfo * info, ModMapEntry * new)
                     use = mm->modifier;
                     ignore = new->modifier;
                 }
-                ERROR1
+                ERROR
                     ("%s added to symbol map for multiple modifiers\n",
                      XkbKeysymText(new->u.keySym, XkbMessage));
-                ACTION2("Using %s, ignoring %s.\n",
+                ACTION("Using %s, ignoring %s.\n",
                         XkbModIndexText(use, XkbMessage),
                         XkbModIndexText(ignore, XkbMessage));
                 mm->modifier = use;
@@ -683,9 +683,9 @@ AddModMapEntry(SymbolsInfo * info, ModMapEntry * new)
                     use = mm->modifier;
                     ignore = new->modifier;
                 }
-                ERROR1("Key %s added to map for multiple modifiers\n",
+                ERROR("Key %s added to map for multiple modifiers\n",
                        longText(new->u.keyName, XkbMessage));
-                ACTION2("Using %s, ignoring %s.\n",
+                ACTION("Using %s, ignoring %s.\n",
                         XkbModIndexText(use, XkbMessage),
                         XkbModIndexText(ignore, XkbMessage));
                 mm->modifier = use;
@@ -697,7 +697,7 @@ AddModMapEntry(SymbolsInfo * info, ModMapEntry * new)
     if (mm == NULL)
     {
         WSGO("Could not allocate modifier map entry\n");
-        ACTION1("Modifier map for %s will be incomplete\n",
+        ACTION("Modifier map for %s will be incomplete\n",
                 XkbModIndexText(new->modifier, XkbMessage));
         return False;
     }
@@ -902,24 +902,24 @@ GetGroupIndex(KeyInfo * key,
                 return True;
             }
         }
-        ERROR3("Too many groups of %s for key %s (max %d)\n", name,
+        ERROR("Too many groups of %s for key %s (max %d)\n", name,
                longText(key->name, XkbMessage), XkbNumKbdGroups + 1);
-        ACTION1("Ignoring %s defined for extra groups\n", name);
+        ACTION("Ignoring %s defined for extra groups\n", name);
         return False;
     }
     if (!ExprResolveInteger
         (arrayNdx, &tmp, SimpleLookup, (XPointer) groupNames))
     {
-        ERROR2("Illegal group index for %s of key %s\n", name,
+        ERROR("Illegal group index for %s of key %s\n", name,
                longText(key->name, XkbMessage));
         ACTION("Definition with non-integer array index ignored\n");
         return False;
     }
     if ((tmp.uval < 1) || (tmp.uval > XkbNumKbdGroups))
     {
-        ERROR3("Group index for %s of key %s is out of range (1..%d)\n",
+        ERROR("Group index for %s of key %s is out of range (1..%d)\n",
                name, longText(key->name, XkbMessage), XkbNumKbdGroups + 1);
-        ACTION2("Ignoring %s for group %d\n", name, tmp.uval);
+        ACTION("Ignoring %s for group %d\n", name, tmp.uval);
         return False;
     }
     *ndx_rtrn = tmp.uval - 1;
@@ -944,15 +944,15 @@ AddSymbolsToKey(KeyInfo * key,
     }
     if (value->op != ExprKeysymList)
     {
-        ERROR1("Expected a list of symbols, found %s\n",
+        ERROR("Expected a list of symbols, found %s\n",
                exprOpText(value->op));
-        ACTION2("Ignoring symbols for group %d of %s\n", ndx,
+        ACTION("Ignoring symbols for group %d of %s\n", ndx,
                 longText(key->name, XkbMessage));
         return False;
     }
     if (key->syms[ndx] != NULL)
     {
-        WSGO2("Symbols for key %s, group %d already defined\n",
+        WSGO("Symbols for key %s, group %d already defined\n",
               longText(key->name, XkbMessage), ndx);
         return False;
     }
@@ -960,7 +960,7 @@ AddSymbolsToKey(KeyInfo * key,
     if (((key->numLevels[ndx] < nSyms) || (key->syms[ndx] == NULL)) &&
         (!ResizeKeyGroup(key, ndx, nSyms, False)))
     {
-        WSGO2("Could not resize group %d of key %s\n", ndx,
+        WSGO("Could not resize group %d of key %s\n", ndx,
               longText(key->name, XkbMessage));
         ACTION("Symbols lost\n");
         return False;
@@ -968,7 +968,7 @@ AddSymbolsToKey(KeyInfo * key,
     key->symsDefined |= (1 << ndx);
     for (i = 0; i < nSyms; i++) {
         if (!LookupKeysym(value->value.list.syms[i], &key->syms[ndx][i])) {
-            WARN2("Could not resolve keysym %s\n", value->value.list.syms[i]);
+            WARN("Could not resolve keysym %s\n", value->value.list.syms[i]);
             key->syms[ndx][i] = NoSymbol;
         }
     }
@@ -1001,14 +1001,14 @@ AddActionsToKey(KeyInfo * key,
     }
     if (value->op != ExprActionList)
     {
-        WSGO1("Bad expression type (%d) for action list value\n", value->op);
-        ACTION2("Ignoring actions for group %d of %s\n", ndx,
+        WSGO("Bad expression type (%d) for action list value\n", value->op);
+        ACTION("Ignoring actions for group %d of %s\n", ndx,
                 longText(key->name, XkbMessage));
         return False;
     }
     if (key->acts[ndx] != NULL)
     {
-        WSGO2("Actions for key %s, group %d already defined\n",
+        WSGO("Actions for key %s, group %d already defined\n",
               longText(key->name, XkbMessage), ndx);
         return False;
     }
@@ -1024,7 +1024,7 @@ AddActionsToKey(KeyInfo * key,
     if (((key->numLevels[ndx] < nActs) || (key->acts[ndx] == NULL)) &&
         (!ResizeKeyGroup(key, ndx, nActs, True)))
     {
-        WSGO2("Could not resize group %d of key %s\n", ndx,
+        WSGO("Could not resize group %d of key %s\n", ndx,
               longText(key->name, XkbMessage));
         ACTION("Actions lost\n");
         return False;
@@ -1037,9 +1037,9 @@ AddActionsToKey(KeyInfo * key,
     {
         if (!HandleActionDef(act, xkb, toAct, MergeOverride, info->action))
         {
-            ERROR1("Illegal action definition for %s\n",
+            ERROR("Illegal action definition for %s\n",
                    longText(key->name, XkbMessage));
-            ACTION2("Action for group %d/level %d ignored\n", ndx + 1, i + 1);
+            ACTION("Action for group %d/level %d ignored\n", ndx + 1, i + 1);
         }
         act = (ExprDef *) act->common.next;
     }
@@ -1066,9 +1066,9 @@ SetAllowNone(KeyInfo * key, ExprDef * arrayNdx, ExprDef * value)
         }
         if ((tmp.uval < 1) || (tmp.uval > XkbMaxRadioGroups))
         {
-            ERROR1("Illegal radio group specified (must be 1..%d)\n",
+            ERROR("Illegal radio group specified (must be 1..%d)\n",
                    XkbMaxRadioGroups + 1);
-            ACTION1("Value of \"allow none\" for group %d ignored\n",
+            ACTION("Value of \"allow none\" for group %d ignored\n",
                     tmp.uval);
             return False;
         }
@@ -1076,7 +1076,7 @@ SetAllowNone(KeyInfo * key, ExprDef * arrayNdx, ExprDef * value)
     }
     if (!ExprResolveBoolean(value, &tmp, NULL, NULL))
     {
-        ERROR1("Illegal \"allow none\" value for %s\n",
+        ERROR("Illegal \"allow none\" value for %s\n",
                longText(key->name, XkbMessage));
         ACTION("Non-boolean value ignored\n");
         return False;
@@ -1142,17 +1142,17 @@ SetSymbolsField(KeyInfo * key,
         else if (!ExprResolveInteger(arrayNdx, &ndx, SimpleLookup,
                                      (XPointer) groupNames))
         {
-            ERROR1("Illegal group index for type of key %s\n",
+            ERROR("Illegal group index for type of key %s\n",
                    longText(key->name, XkbMessage));
             ACTION("Definition with non-integer array index ignored\n");
             return False;
         }
         else if ((ndx.uval < 1) || (ndx.uval > XkbNumKbdGroups))
         {
-            ERROR2
+            ERROR
                 ("Group index for type of key %s is out of range (1..%d)\n",
                  longText(key->name, XkbMessage), XkbNumKbdGroups + 1);
-            ACTION1("Ignoring type for group %d\n", ndx.uval);
+            ACTION("Ignoring type for group %d\n", ndx.uval);
             return False;
         }
         else
@@ -1177,9 +1177,9 @@ SetSymbolsField(KeyInfo * key,
         }
         else
         {
-            ERROR1("Expected a virtual modifier mask, found %s\n",
+            ERROR("Expected a virtual modifier mask, found %s\n",
                    exprOpText(value->op));
-            ACTION1("Ignoring virtual modifiers definition for key %s\n",
+            ACTION("Ignoring virtual modifiers definition for key %s\n",
                     longText(key->name, XkbMessage));
         }
     }
@@ -1202,7 +1202,7 @@ SetSymbolsField(KeyInfo * key,
                                 (XPointer) rgEntries);
         if (!ok)
         {
-            ERROR1("Illegal radio group specification for %s\n",
+            ERROR("Illegal radio group specification for %s\n",
                    longText(key->name, XkbMessage));
             ACTION("Non-integer radio group ignored\n");
             return False;
@@ -1215,10 +1215,10 @@ SetSymbolsField(KeyInfo * key,
         }
         if ((tmp.uval < 1) || (tmp.uval > XkbMaxRadioGroups))
         {
-            ERROR1
+            ERROR
                 ("Radio group specification for %s out of range (1..32)\n",
                  longText(key->name, XkbMessage));
-            ACTION1("Illegal radio group %d ignored\n", tmp.uval);
+            ACTION("Illegal radio group %d ignored\n", tmp.uval);
             return False;
         }
         key->behavior.type =
@@ -1251,7 +1251,7 @@ SetSymbolsField(KeyInfo * key,
         {
             if (((overlayNdx < 1) || (overlayNdx > 2)) && (warningLevel > 0))
             {
-                ERROR2("Illegal overlay %d specified for %s\n",
+                ERROR("Illegal overlay %d specified for %s\n",
                        overlayNdx, longText(key->name, XkbMessage));
                 ACTION("Ignored\n");
                 return False;
@@ -1261,7 +1261,7 @@ SetSymbolsField(KeyInfo * key,
             overlayNdx = 1;
         else if (warningLevel > 0)
         {
-            ERROR2("Illegal overlay \"%s\" specified for %s\n",
+            ERROR("Illegal overlay \"%s\" specified for %s\n",
                    which, longText(key->name, XkbMessage));
             ACTION("Ignored\n");
             return False;
@@ -1269,7 +1269,7 @@ SetSymbolsField(KeyInfo * key,
         ok = ExprResolveKeyName(value, &tmp, NULL, NULL);
         if (!ok)
         {
-            ERROR1("Illegal overlay key specification for %s\n",
+            ERROR("Illegal overlay key specification for %s\n",
                    longText(key->name, XkbMessage));
             ACTION("Overlay key must be specified by name\n");
             return False;
@@ -1292,7 +1292,7 @@ SetSymbolsField(KeyInfo * key,
         ok = ExprResolveEnum(value, &tmp, repeatEntries);
         if (!ok)
         {
-            ERROR1("Illegal repeat setting for %s\n",
+            ERROR("Illegal repeat setting for %s\n",
                    longText(key->name, XkbMessage));
             ACTION("Non-boolean repeat setting ignored\n");
             return False;
@@ -1306,7 +1306,7 @@ SetSymbolsField(KeyInfo * key,
         ok = ExprResolveBoolean(value, &tmp, NULL, NULL);
         if (!ok)
         {
-            ERROR1("Illegal groupsWrap setting for %s\n",
+            ERROR("Illegal groupsWrap setting for %s\n",
                    longText(key->name, XkbMessage));
             ACTION("Non-boolean value ignored\n");
             return False;
@@ -1323,7 +1323,7 @@ SetSymbolsField(KeyInfo * key,
         ok = ExprResolveBoolean(value, &tmp, NULL, NULL);
         if (!ok)
         {
-            ERROR1("Illegal groupsClamp setting for %s\n",
+            ERROR("Illegal groupsClamp setting for %s\n",
                    longText(key->name, XkbMessage));
             ACTION("Non-boolean value ignored\n");
             return False;
@@ -1340,16 +1340,16 @@ SetSymbolsField(KeyInfo * key,
         if (!ExprResolveInteger
             (value, &tmp, SimpleLookup, (XPointer) groupNames))
         {
-            ERROR1("Illegal group index for redirect of key %s\n",
+            ERROR("Illegal group index for redirect of key %s\n",
                    longText(key->name, XkbMessage));
             ACTION("Definition with non-integer group ignored\n");
             return False;
         }
         if ((tmp.uval < 1) || (tmp.uval > XkbNumKbdGroups))
         {
-            ERROR2("Out-of-range (1..%d) group for redirect of key %s\n",
+            ERROR("Out-of-range (1..%d) group for redirect of key %s\n",
                    XkbNumKbdGroups, longText(key->name, XkbMessage));
-            ERROR1("Ignoring illegal group %d\n", tmp.uval);
+            ERROR("Ignoring illegal group %d\n", tmp.uval);
             return False;
         }
         key->groupInfo =
@@ -1358,7 +1358,7 @@ SetSymbolsField(KeyInfo * key,
     }
     else
     {
-        ERROR1("Unknown field %s in a symbol interpretation\n", field);
+        ERROR("Unknown field %s in a symbol interpretation\n", field);
         ACTION("Definition ignored\n");
         ok = False;
     }
@@ -1385,16 +1385,16 @@ SetGroupName(SymbolsInfo * info, ExprDef * arrayNdx, ExprDef * value)
     }
     if ((tmp.uval < 1) || (tmp.uval > XkbNumKbdGroups))
     {
-        ERROR1
+        ERROR
             ("Attempt to specify name for illegal group (must be 1..%d)\n",
              XkbNumKbdGroups + 1);
-        ACTION1("Name for group %d ignored\n", tmp.uval);
+        ACTION("Name for group %d ignored\n", tmp.uval);
         return False;
     }
     if (!ExprResolveString(value, &name, NULL, NULL))
     {
         ERROR("Group name must be a string\n");
-        ACTION1("Illegal name for group %d ignored\n", tmp.uval);
+        ACTION("Illegal name for group %d ignored\n", tmp.uval);
         return False;
     }
     info->groupNames[tmp.uval - 1 + info->explicit_group] =
@@ -1467,10 +1467,10 @@ HandleSymbolsVar(VarDef * stmt, XkbDescPtr xkb, SymbolsInfo * info)
         }
         if ((tmp.uval < 1) || (tmp.uval > XkbNumKbdGroups))
         {
-            ERROR1
+            ERROR
                 ("Out-of-range (1..%d) group for global groupsRedirect\n",
                  XkbNumKbdGroups);
-            ACTION1("Ignoring illegal group %d\n", tmp.uval);
+            ACTION("Ignoring illegal group %d\n", tmp.uval);
             return False;
         }
         info->groupInfo = XkbSetGroupInfo(0, XkbRedirectIntoRange, tmp.uval);
@@ -1533,8 +1533,8 @@ SetExplicitGroup(SymbolsInfo * info, KeyInfo * key)
     if ((key->typesDefined | key->symsDefined | key->actsDefined) & ~1)
     {
         int i;
-        WARN1("For the map %s an explicit group specified\n", info->name);
-        WARN1("but key %s has more than one group defined\n",
+        WARN("For the map %s an explicit group specified\n", info->name);
+        WARN("but key %s has more than one group defined\n",
               longText(key->name, XkbMessage));
         ACTION("All groups except first one will be ignored\n");
         for (i = 1; i < XkbNumKbdGroups; i++)
@@ -1604,7 +1604,7 @@ HandleModMapDef(ModMapDef * def,
     if (!LookupModIndex(NULL, None, def->modifier, TypeInt, &rtrn))
     {
         ERROR("Illegal modifier map definition\n");
-        ACTION1("Ignoring map for non-modifier \"%s\"\n",
+        ACTION("Ignoring map for non-modifier \"%s\"\n",
                 XkbAtomText(NULL, def->modifier, XkbMessage));
         return False;
     }
@@ -1625,7 +1625,7 @@ HandleModMapDef(ModMapDef * def,
         else
         {
             ERROR("Modmap entries may contain only key names or keysyms\n");
-            ACTION1("Illegal definition for %s modifier ignored\n",
+            ACTION("Illegal definition for %s modifier ignored\n",
                     XkbModIndexText(tmp.modifier, XkbMessage));
             continue;
         }
@@ -1679,7 +1679,7 @@ HandleSymbolsFile(XkbFile * file,
                 info->errorCount++;
             break;
         default:
-            WSGO1("Unexpected statement type %d in HandleSymbolsFile\n",
+            WSGO("Unexpected statement type %d in HandleSymbolsFile\n",
                   stmt->stmtType);
             break;
         }
@@ -1689,7 +1689,7 @@ HandleSymbolsFile(XkbFile * file,
 #ifdef NOISY
             ERROR("Too many errors\n");
 #endif
-            ACTION1("Abandoning symbols file \"%s\"\n", file->topName);
+            ACTION("Abandoning symbols file \"%s\"\n", file->topName);
             break;
         }
     }
@@ -1971,7 +1971,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from)
     {
         if ((start_from == 0) && (warningLevel >= 5))
         {
-            WARN2("Key %s not found in %s keycodes\n",
+            WARN("Key %s not found in %s keycodes\n",
                   longText(key->name, XkbMessage),
                   XkbAtomText(NULL, xkb->names->keycodes, XkbMessage));
             ACTION("Symbols ignored\n");
@@ -2002,9 +2002,9 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from)
             {
                 if (warningLevel >= 5)
                 {
-                    WARN1("No automatic type for %d symbols\n",
+                    WARN("No automatic type for %d symbols\n",
                           (unsigned int) key->numLevels[i]);
-                    ACTION3("Using %s for the %s key (keycode %d)\n",
+                    ACTION("Using %s for the %s key (keycode %d)\n",
                             XkbAtomText(NULL, key->types[i],
                                         XkbMessage),
                             longText(key->name, XkbMessage), kc);
@@ -2020,9 +2020,9 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from)
         {
             if (warningLevel >= 3)
             {
-                WARN1("Type \"%s\" is not defined\n",
+                WARN("Type \"%s\" is not defined\n",
                       XkbAtomText(NULL, key->types[i], XkbMessage));
-                ACTION2("Using TWO_LEVEL for the %s key (keycode %d)\n",
+                ACTION("Using TWO_LEVEL for the %s key (keycode %d)\n",
                         longText(key->name, XkbMessage), kc);
             }
             types[i] = XkbTwoLevelIndex;
@@ -2033,7 +2033,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from)
         {
             if (warningLevel > 5)
             {
-                WARN4
+                WARN
                     ("Type \"%s\" has %d levels, but %s has %d symbols\n",
                      XkbAtomText(NULL, type->name, XkbMessage),
                      (unsigned int) type->num_levels,
@@ -2055,7 +2055,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from)
     outSyms = XkbResizeKeySyms(xkb, kc, i);
     if (outSyms == NULL)
     {
-        WSGO2("Could not enlarge symbols for %s (keycode %d)\n",
+        WSGO("Could not enlarge symbols for %s (keycode %d)\n",
               longText(key->name, XkbMessage), kc);
         return False;
     }
@@ -2064,7 +2064,7 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from)
         outActs = XkbResizeKeyActions(xkb, kc, i);
         if (outActs == NULL)
         {
-            WSGO2("Could not enlarge actions for %s (key %d)\n",
+            WSGO("Could not enlarge actions for %s (key %d)\n",
                   longText(key->name, XkbMessage), kc);
             return False;
         }
@@ -2124,10 +2124,10 @@ CopySymbolsDef(XkbFileInfo * result, KeyInfo * key, int start_from)
         {
             if (warningLevel >= 1)
             {
-                WARN2("Key %s not found in %s keycodes\n",
+                WARN("Key %s not found in %s keycodes\n",
                       longText(key->nameForOverlayKey, XkbMessage),
                       XkbAtomText(NULL, xkb->names->keycodes, XkbMessage));
-                ACTION1("Not treating %s as an overlay key \n",
+                ACTION("Not treating %s as an overlay key \n",
                         longText(key->name, XkbMessage));
             }
             break;
@@ -2171,10 +2171,10 @@ CopyModMapDef(XkbFileInfo * result, ModMapEntry * entry)
     {
         if (warningLevel >= 5)
         {
-            WARN2("Key %s not found in %s keycodes\n",
+            WARN("Key %s not found in %s keycodes\n",
                   longText(entry->u.keyName, XkbMessage),
                   XkbAtomText(NULL, xkb->names->keycodes, XkbMessage));
-            ACTION1("Modifier map entry for %s not updated\n",
+            ACTION("Modifier map entry for %s not updated\n",
                     XkbModIndexText(entry->modifier, XkbMessage));
         }
         return False;
@@ -2184,10 +2184,10 @@ CopyModMapDef(XkbFileInfo * result, ModMapEntry * entry)
     {
         if (warningLevel > 5)
         {
-            WARN2("Key \"%s\" not found in %s symbol map\n",
+            WARN("Key \"%s\" not found in %s symbol map\n",
                   XkbKeysymText(entry->u.keySym, XkbMessage),
                   XkbAtomText(NULL, xkb->names->symbols, XkbMessage));
-            ACTION1("Modifier map entry for %s not updated\n",
+            ACTION("Modifier map entry for %s not updated\n",
                     XkbModIndexText(entry->modifier, XkbMessage));
         }
         return False;
@@ -2281,8 +2281,7 @@ CompileSymbols(XkbFile * file, XkbFileInfo * result, unsigned merge)
                     char buf[5];
                     memcpy(buf, xkb->names->keys[i].name, 4);
                     buf[4] = '\0';
-                    WARN2
-                        ("No symbols defined for <%s> (keycode %d)\n",
+                    INFO("No symbols defined for <%s> (keycode %d)\n",
                          buf, i);
                 }
             }
diff --git a/app/xkbcomp/tokens.h b/app/xkbcomp/tokens.h
index 970f3d4de..c75b646aa 100644
--- a/app/xkbcomp/tokens.h
+++ b/app/xkbcomp/tokens.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/utils.c b/app/xkbcomp/utils.c
index 541c33e14..cba6fec17 100644
--- a/app/xkbcomp/utils.c
+++ b/app/xkbcomp/utils.c
@@ -8,8 +8,8 @@
    *
    * THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
    * SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
-   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE 
-   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED 
+   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
    * WARRANTY.
    *
    * IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -21,7 +21,7 @@
    * that the above copyright notice appear in all copies and that both that
    * copyright notice and this permission notice appear in supporting
    * documentation, and that the name of Digital Equipment Corporation not be
-   * used in advertising or publicity pertaining to distribution of the 
+   * used in advertising or publicity pertaining to distribution of the
    * software without specific, written prior permission.
    \*/
 
diff --git a/app/xkbcomp/utils.h b/app/xkbcomp/utils.h
index 81f5893b6..728d7b4e1 100644
--- a/app/xkbcomp/utils.h
+++ b/app/xkbcomp/utils.h
@@ -10,8 +10,8 @@
    *
    * THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
    * SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
-   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE 
-   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED 
+   * DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE
+   * FOR ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED
    * WARRANTY.
    *
    * IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT
@@ -23,7 +23,7 @@
    * that the above copyright notice appear in all copies and that both that
    * copyright notice and this permission notice appear in supporting
    * documentation, and that the name of Digital Equipment Corporation not be
-   * used in advertising or publicity pertaining to distribution of the 
+   * used in advertising or publicity pertaining to distribution of the
    * software without specific, written prior permission.
    \*/
 
@@ -107,69 +107,33 @@ extern void uFree(Opaque        /* ptr */
 extern Boolean uSetErrorFile(char *     /* name */
     );
 
-#define INFO6 			uInformation
-#define INFO5 			uInformation
-#define INFO4 			uInformation
-#define INFO3 			uInformation
-#define INFO2 			uInformation
-#define INFO1 			uInformation
 #define INFO 			uInformation
 
 extern void
 uInformation(const char * /* s */ , ...
     ) _X_ATTRIBUTE_PRINTF(1, 2);
 
-#define ACTION6			uAction
-#define ACTION5			uAction
-#define ACTION4			uAction
-#define ACTION3			uAction
-#define ACTION2			uAction
-#define ACTION1			uAction
 #define ACTION			uAction
 
      extern void uAction(const char * /* s  */ , ...
     ) _X_ATTRIBUTE_PRINTF(1, 2);
 
-#define WARN6			uWarning
-#define WARN5			uWarning
-#define WARN4			uWarning
-#define WARN3			uWarning
-#define WARN2			uWarning
-#define WARN1			uWarning
 #define WARN			uWarning
 
      extern void uWarning(const char * /* s  */ , ...
     ) _X_ATTRIBUTE_PRINTF(1, 2);
 
-#define ERROR6			uError
-#define ERROR5			uError
-#define ERROR4			uError
-#define ERROR3			uError
-#define ERROR2			uError
-#define ERROR1			uError
 #define ERROR			uError
 
      extern void uError(const char * /* s  */ , ...
     ) _X_ATTRIBUTE_PRINTF(1, 2);
 
-#define FATAL6			uFatalError
-#define FATAL5			uFatalError
-#define FATAL4			uFatalError
-#define FATAL3			uFatalError
-#define FATAL2			uFatalError
-#define FATAL1			uFatalError
 #define FATAL			uFatalError
 
      extern void uFatalError(const char * /* s  */ , ...
     ) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
 
 /* WSGO stands for "Weird Stuff Going On" */
-#define WSGO6			uInternalError
-#define WSGO5			uInternalError
-#define WSGO4			uInternalError
-#define WSGO3			uInternalError
-#define WSGO2			uInternalError
-#define WSGO1			uInternalError
 #define WSGO			uInternalError
 
      extern void uInternalError(const char * /* s  */ , ...
diff --git a/app/xkbcomp/vmod.c b/app/xkbcomp/vmod.c
index 5578fd01f..847838606 100644
--- a/app/xkbcomp/vmod.c
+++ b/app/xkbcomp/vmod.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -107,21 +107,21 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info)
                     if (!ExprResolveModMask(stmt->value, &mod, NULL, NULL))
                     {
                         str1 = XkbAtomText(NULL, stmt->name, XkbMessage);
-                        ACTION1("Declaration of %s ignored\n", str1);
+                        ACTION("Declaration of %s ignored\n", str1);
                         return False;
                     }
                     if (mod.uval == srv->vmods[i])
                         return True;
 
                     str1 = XkbAtomText(NULL, stmt->name, XkbMessage);
-                    WARN1("Virtual modifier %s multiply defined\n", str1);
+                    WARN("Virtual modifier %s multiply defined\n", str1);
                     str1 = XkbModMaskText(srv->vmods[i], XkbCFile);
                     if (mergeMode == MergeOverride)
                     {
                         str2 = str1;
                         str1 = XkbModMaskText(mod.uval, XkbCFile);
                     }
-                    ACTION2("Using %s, ignoring %s\n", str1, str2);
+                    ACTION("Using %s, ignoring %s\n", str1, str2);
                     if (mergeMode == MergeOverride)
                         srv->vmods[i] = mod.uval;
                     return True;
@@ -133,7 +133,7 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info)
     }
     if (nextFree < 0)
     {
-        ERROR1("Too many virtual modifiers defined (maximum %d)\n",
+        ERROR("Too many virtual modifiers defined (maximum %d)\n",
                XkbNumVirtualMods);
         ACTION("Exiting\n");
         return False;
@@ -149,7 +149,7 @@ HandleVModDef(VModDef * stmt, unsigned mergeMode, VModInfo * info)
         srv->vmods[nextFree] = mod.uval;
         return True;
     }
-    ACTION1("Declaration of %s ignored\n",
+    ACTION("Declaration of %s ignored\n",
             XkbAtomText(NULL, stmt->name, XkbMessage));
     return False;
 }
@@ -264,7 +264,7 @@ ResolveVirtualModifier(ExprDef * def, ExprResult * val_rtrn, VModInfo * info)
     {
         if (val_rtrn->uval < XkbNumVirtualMods)
             return True;
-        ERROR2("Illegal virtual modifier %d (must be 0..%d inclusive)\n",
+        ERROR("Illegal virtual modifier %d (must be 0..%d inclusive)\n",
                val_rtrn->uval, XkbNumVirtualMods - 1);
     }
     return False;
diff --git a/app/xkbcomp/vmod.h b/app/xkbcomp/vmod.h
index 559b9d504..75f9fb4b5 100644
--- a/app/xkbcomp/vmod.h
+++ b/app/xkbcomp/vmod.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/xkbcomp.c b/app/xkbcomp/xkbcomp.c
index f1449163e..796fa22a5 100644
--- a/app/xkbcomp/xkbcomp.c
+++ b/app/xkbcomp/xkbcomp.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -202,7 +202,7 @@ setVerboseFlags(char *str)
         default:
             if (warningLevel > 4)
             {
-                WARN1("Unknown verbose option \"%c\"\n", (unsigned int) *str);
+                WARN("Unknown verbose option \"%c\"\n", (unsigned int) *str);
                 ACTION("Ignored\n");
             }
             break;
@@ -236,7 +236,7 @@ parseArgs(int argc, char *argv[])
                 else if (warningLevel > 0)
                 {
                     WARN("Too many file names on command line\n");
-                    ACTION3
+                    ACTION
                         ("Compiling %s, writing to %s, ignoring %s\n",
                          inputFile, outputFile, argv[i]);
                 }
@@ -266,7 +266,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple output file formats specified\n");
-                    ACTION1("\"%s\" flag ignored\n", argv[i]);
+                    ACTION("\"%s\" flag ignored\n", argv[i]);
                 }
             }
             else
@@ -284,7 +284,7 @@ parseArgs(int argc, char *argv[])
                 if (sscanf(argv[++i], "%i", &itmp) == 1)
                     debugFlags = itmp;
             }
-            INFO1("Setting debug flags to %d\n", debugFlags);
+            INFO("Setting debug flags to %d\n", debugFlags);
         }
 #endif
         else if ((strcmp(argv[i], "-dflts") == 0) && (!xkblist))
@@ -306,7 +306,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple pre-error messages specified\n");
-                    ACTION2("Compiling %s, ignoring %s\n",
+                    ACTION("Compiling %s, ignoring %s\n",
                             preErrorMsg, argv[i]);
                 }
             }
@@ -328,7 +328,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple error prefixes specified\n");
-                    ACTION2("Compiling %s, ignoring %s\n",
+                    ACTION("Compiling %s, ignoring %s\n",
                             errorPrefix, argv[i]);
                 }
             }
@@ -350,7 +350,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple post-error messages specified\n");
-                    ACTION2("Compiling %s, ignoring %s\n",
+                    ACTION("Compiling %s, ignoring %s\n",
                             postErrorMsg, argv[i]);
                 }
             }
@@ -381,7 +381,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple output file formats specified\n");
-                    ACTION1("\"%s\" flag ignored\n", argv[i]);
+                    ACTION("\"%s\" flag ignored\n", argv[i]);
                 }
             }
             else
@@ -407,7 +407,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("No map name specified\n");
-                    ACTION1("Trailing \"%s\" option ignored\n", argv[i - 1]);
+                    ACTION("Trailing \"%s\" option ignored\n", argv[i - 1]);
                 }
             }
             else if (xkblist)
@@ -420,7 +420,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple map names specified\n");
-                    ACTION2("Compiling %s, ignoring %s\n", inputMap, argv[i]);
+                    ACTION("Compiling %s, ignoring %s\n", inputMap, argv[i]);
                 }
             }
             else
@@ -445,7 +445,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple output files specified\n");
-                    ACTION2("Compiling %s, ignoring %s\n", outputFile,
+                    ACTION("Compiling %s, ignoring %s\n", outputFile,
                             argv[i]);
                 }
             }
@@ -460,7 +460,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("No optional components specified\n");
-                    ACTION1("Trailing \"%s\" option ignored\n", argv[i - 1]);
+                    ACTION("Trailing \"%s\" option ignored\n", argv[i - 1]);
                 }
             }
             else
@@ -493,10 +493,10 @@ parseArgs(int argc, char *argv[])
                     default:
                         if (warningLevel > 0)
                         {
-                            WARN1
+                            WARN
                                 ("Illegal component for %s option\n",
                                  argv[i - 1]);
-                            ACTION1
+                            ACTION
                                 ("Ignoring unknown specifier \"%c\"\n",
                                  (unsigned int) *tmp2);
                         }
@@ -522,7 +522,7 @@ parseArgs(int argc, char *argv[])
                 dirsToStrip = 0;
             }
             if (warningLevel > 5)
-                INFO1("Setting path count to %d\n", dirsToStrip);
+                INFO("Setting path count to %d\n", dirsToStrip);
         }
         else if (strncmp(argv[i], "-R", 2) == 0)
         {
@@ -539,7 +539,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple root directories specified\n");
-                    ACTION2("Using %s, ignoring %s\n", rootDir, argv[i]);
+                    ACTION("Using %s, ignoring %s\n", rootDir, argv[i]);
                 }
             }
             else
@@ -547,14 +547,14 @@ parseArgs(int argc, char *argv[])
                 rootDir = &argv[i][2];
                 if (warningLevel > 8)
                 {
-                    WARN1("Changing root directory to \"%s\"\n", rootDir);
+                    WARN("Changing root directory to \"%s\"\n", rootDir);
                 }
                 if (chdir(rootDir) == 0)
                 {
                     XkbAddDirectoryToPath(".");
                 } else if (warningLevel > 0)
                 {
-                       WARN1("Couldn't change directory to \"%s\"\n", rootDir);
+                       WARN("Couldn't change directory to \"%s\"\n", rootDir);
                        ACTION("Root directory (-R) option ignored\n");
                        rootDir = NULL;
                 }
@@ -606,7 +606,7 @@ parseArgs(int argc, char *argv[])
                     warningLevel = utmp > 10 ? 10 : utmp;
                 else
                 {
-                    ERROR1("Unknown flag \"%s\" on command line\n", argv[i]);
+                    ERROR("Unknown flag \"%s\" on command line\n", argv[i]);
                     Usage(argc, argv);
                     return False;
                 }
@@ -620,7 +620,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple output file formats specified\n");
-                    ACTION1("\"%s\" flag ignored\n", argv[i]);
+                    ACTION("\"%s\" flag ignored\n", argv[i]);
                 }
             }
             else
@@ -634,7 +634,7 @@ parseArgs(int argc, char *argv[])
                 if (warningLevel > 0)
                 {
                     WARN("Multiple output file formats specified\n");
-                    ACTION1("\"%s\" flag ignored\n", argv[i]);
+                    ACTION("\"%s\" flag ignored\n", argv[i]);
                 }
             }
             else
@@ -642,7 +642,7 @@ parseArgs(int argc, char *argv[])
         }
         else
         {
-            ERROR1("Unknown flag \"%s\" on command line\n", argv[i]);
+            ERROR("Unknown flag \"%s\" on command line\n", argv[i]);
             Usage(argc, argv);
             return False;
         }
@@ -691,12 +691,12 @@ parseArgs(int argc, char *argv[])
                 else
                 {
                     WARN("Map specified in filename and with -m flag\n");
-                    ACTION1("map from name (\"%s\") ignored\n", tmpstr);
+                    ACTION("map from name (\"%s\") ignored\n", tmpstr);
                 }
             }
             else
             {
-                ERROR1("Illegal name \"%s\" for input file\n", inputFile);
+                ERROR("Illegal name \"%s\" for input file\n", inputFile);
                 return False;
             }
         }
@@ -861,25 +861,25 @@ GetDisplay(char *program, char *dpyName)
         switch (error)
         {
         case XkbOD_BadLibraryVersion:
-            INFO3("%s was compiled with XKB version %d.%02d\n",
+            INFO("%s was compiled with XKB version %d.%02d\n",
                   program, XkbMajorVersion, XkbMinorVersion);
-            ERROR2("X library supports incompatible version %d.%02d\n",
+            ERROR("X library supports incompatible version %d.%02d\n",
                    mjr, mnr);
             break;
         case XkbOD_ConnectionRefused:
-            ERROR1("Cannot open display \"%s\"\n", dpyName);
+            ERROR("Cannot open display \"%s\"\n", dpyName);
             break;
         case XkbOD_NonXkbServer:
-            ERROR1("XKB extension not present on %s\n", dpyName);
+            ERROR("XKB extension not present on %s\n", dpyName);
             break;
         case XkbOD_BadServerVersion:
-            INFO3("%s was compiled with XKB version %d.%02d\n",
+            INFO("%s was compiled with XKB version %d.%02d\n",
                   program, XkbMajorVersion, XkbMinorVersion);
-            ERROR3("Server %s uses incompatible version %d.%02d\n",
+            ERROR("Server %s uses incompatible version %d.%02d\n",
                    dpyName, mjr, mnr);
             break;
         default:
-            WSGO1("Unknown error %d from XkbOpenDisplay\n", error);
+            WSGO("Unknown error %d from XkbOpenDisplay\n", error);
         }
     }
     else if (synch)
@@ -968,9 +968,9 @@ main(int argc, char *argv[])
         mnr = XkbMinorVersion;
         if (!XkbLibraryVersion(&mjr, &mnr))
         {
-            INFO3("%s was compiled with XKB version %d.%02d\n",
+            INFO("%s was compiled with XKB version %d.%02d\n",
                   argv[0], XkbMajorVersion, XkbMinorVersion);
-            ERROR2("X library supports incompatible version %d.%02d\n",
+            ERROR("X library supports incompatible version %d.%02d\n",
                    mjr, mnr);
             ACTION("Exiting\n");
             exit(1);
@@ -994,7 +994,7 @@ main(int argc, char *argv[])
                 }
                 if (!mapToUse)
                 {
-                    FATAL2("No map named \"%s\" in \"%s\"\n",
+                    FATAL("No map named \"%s\" in \"%s\"\n",
                            inputMap, inputFile);
                     /* NOTREACHED */
                 }
@@ -1013,10 +1013,10 @@ main(int argc, char *argv[])
                     mapToUse = rtrn;
                     if (warningLevel > 4)
                     {
-                        WARN1
+                        WARN
                             ("No map specified, but \"%s\" has several\n",
                              inputFile);
-                        ACTION1
+                        ACTION
                             ("Using the first defined map, \"%s\"\n",
                              mapToUse->name);
                     }
@@ -1057,7 +1057,7 @@ main(int argc, char *argv[])
                 ok = CompileGeometry(mapToUse, &result, MergeReplace);
                 break;
             default:
-                WSGO1("Unknown file type %d\n", mapToUse->type);
+                WSGO("Unknown file type %d\n", mapToUse->type);
                 ok = False;
                 break;
             }
@@ -1075,14 +1075,14 @@ main(int argc, char *argv[])
             tmp = XkmReadFile(file, 0, XkmKeymapLegal, &result);
             if (tmp == XkmKeymapLegal)
             {
-                ERROR1("Cannot read XKM file \"%s\"\n", inputFile);
+                ERROR("Cannot read XKM file \"%s\"\n", inputFile);
                 ok = False;
             }
             result.xkb->device_spec = device_id;
         }
         else
         {
-            INFO1("Errors encountered in %s; not compiled.\n", inputFile);
+            INFO("Errors encountered in %s; not compiled.\n", inputFile);
             ok = False;
         }
     }
@@ -1108,8 +1108,8 @@ main(int argc, char *argv[])
                 char buf[100];
                 buf[0] = '\0';
                 XGetErrorText(inDpy, status, buf, 100);
-                WARN1("Could not load keyboard geometry for %s\n", inDpyName);
-                ACTION1("%s\n", buf);
+                WARN("Could not load keyboard geometry for %s\n", inDpyName);
+                ACTION("%s\n", buf);
                 ACTION("Resulting keymap file will not describe geometry\n");
             }
         }
@@ -1129,7 +1129,7 @@ main(int argc, char *argv[])
         if ((inDpy != outDpy) &&
             (XkbChangeKbdDisplay(outDpy, &result) != Success))
         {
-            WSGO2("Error converting keyboard display from %s to %s\n",
+            WSGO("Error converting keyboard display from %s to %s\n",
                   inDpyName, outDpyName);
             exit(1);
         }
@@ -1169,7 +1169,7 @@ main(int argc, char *argv[])
                          | S_IWOTH | binMode);
                 if (outputFileFd < 0)
                 {
-                    ERROR1
+                    ERROR
                         ("Cannot open \"%s\" to write keyboard description\n",
                          outputFile);
                     ACTION("Exiting\n");
@@ -1184,7 +1184,7 @@ main(int argc, char *argv[])
                 /* end BR */
                 if (out == NULL)
                 {
-                    ERROR1
+                    ERROR
                         ("Cannot open \"%s\" to write keyboard description\n",
                          outputFile);
                     ACTION("Exiting\n");
@@ -1206,14 +1206,14 @@ main(int argc, char *argv[])
         case WANT_X_SERVER:
             if (!(ok = XkbWriteToServer(&result)))
             {
-                ERROR2("%s in %s\n", _XkbErrMessages[_XkbErrCode],
+                ERROR("%s in %s\n", _XkbErrMessages[_XkbErrCode],
                        _XkbErrLocation ? _XkbErrLocation : "unknown");
-                ACTION1("Couldn't write keyboard description to %s\n",
+                ACTION("Couldn't write keyboard description to %s\n",
                         outDpyName);
             }
             break;
         default:
-            WSGO1("Unknown output format %d\n", outputFormat);
+            WSGO("Unknown output format %d\n", outputFormat);
             ACTION("No output file created\n");
             ok = False;
             break;
@@ -1222,18 +1222,18 @@ main(int argc, char *argv[])
         {
             if (fclose(out))
             {
-                ERROR1("Cannot close \"%s\" properly (not enough space?)\n",
+                ERROR("Cannot close \"%s\" properly (not enough space?)\n",
                        outputFile);
                 ok= False;
             }
             else if (!ok)
             {
-                ERROR2("%s in %s\n", _XkbErrMessages[_XkbErrCode],
+                ERROR("%s in %s\n", _XkbErrMessages[_XkbErrCode],
                        _XkbErrLocation ? _XkbErrLocation : "unknown");
             }
             if (!ok)
             {
-                ACTION1("Output file \"%s\" removed\n", outputFile);
+                ACTION("Output file \"%s\" removed\n", outputFile);
                 unlink(outputFile);
             }
         }
diff --git a/app/xkbcomp/xkbcomp.h b/app/xkbcomp/xkbcomp.h
index fb4006165..67b88b3ab 100644
--- a/app/xkbcomp/xkbcomp.h
+++ b/app/xkbcomp/xkbcomp.h
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
diff --git a/app/xkbcomp/xkbparse.y b/app/xkbcomp/xkbparse.y
index d816bee6e..88df242ef 100644
--- a/app/xkbcomp/xkbparse.y
+++ b/app/xkbcomp/xkbparse.y
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -139,11 +139,11 @@ unsigned int parseDebug;
 %type <uval>	XkbCompositeType FileType MergeMode OptMergeMode
 %type <uval>	DoodadType Flag Flags OptFlags
 %type <str>	KeyName MapName OptMapName KeySym
-%type <sval>	FieldSpec Ident Element String 
-%type <any>	DeclList Decl 
+%type <sval>	FieldSpec Ident Element String
+%type <any>	DeclList Decl
 %type <expr>	OptExprList ExprList Expr Term Lhs Terminal ArrayInit KeySyms
 %type <expr>	OptKeySymList KeySymList Action ActionList Coord CoordList
-%type <var>	VarDecl VarDeclList SymbolsBody SymbolsVarDecl 
+%type <var>	VarDecl VarDeclList SymbolsBody SymbolsVarDecl
 %type <vmod>	VModDecl VModDefList VModDef
 %type <interp>	InterpretDecl InterpretMatch
 %type <keyType>	KeyTypeDecl
@@ -157,7 +157,7 @@ unsigned int parseDebug;
 %type <shape>	ShapeDecl
 %type <section>	SectionDecl
 %type <row>	SectionBody SectionBodyItem
-%type <key>	RowBody RowBodyItem Keys Key 
+%type <key>	RowBody RowBodyItem Keys Key
 %type <overlay>	OverlayDecl
 %type <olKey>	OverlayKeyList OverlayKey
 %type <outline>	OutlineList OutlineInList
@@ -167,7 +167,7 @@ unsigned int parseDebug;
 %%
 XkbFile		:	XkbCompMapList
 			{ $$= rtrnValue= $1; }
-		|	XkbMapConfigList 
+		|	XkbMapConfigList
 			{ $$= rtrnValue= $1;  }
 		|	XkbConfig
 			{ $$= rtrnValue= $1; }
@@ -339,9 +339,9 @@ KeyNameDecl	:	KeyName EQUALS Expr SEMI
 		;
 
 KeyAliasDecl	:	ALIAS KeyName EQUALS KeyName SEMI
-			{ 
+			{
 			    KeyAliasDef	*def;
-			    def= KeyAliasCreate($2,$4); 
+			    def= KeyAliasCreate($2,$4);
 			    if ($2)	free($2);	
 			    if ($4)	free($4);	
 			    $$= def;
@@ -443,7 +443,7 @@ IndicatorNameDecl:	INDICATOR Integer EQUALS Expr SEMI
 ShapeDecl	:	SHAPE String OBRACE OutlineList CBRACE SEMI
 			{ $$= ShapeDeclCreate($2,(OutlineDef *)&$4->common); }
 		|	SHAPE String OBRACE CoordList CBRACE SEMI
-			{ 
+			{
 			    OutlineDef *outlines;
 			    outlines= OutlineCreate(None,$4);
 			    $$= ShapeDeclCreate($2,outlines);
@@ -501,7 +501,7 @@ OverlayDecl	:	OVERLAY String OBRACE OverlayKeyList CBRACE SEMI
 		;
 
 OverlayKeyList	:	OverlayKeyList COMMA OverlayKey
-			{ 
+			{
 			    $$= (OverlayKeyDef *)
 				AppendStmt(&$1->common,&$3->common);
 			}
diff --git a/app/xkbcomp/xkbpath.c b/app/xkbcomp/xkbpath.c
index b04ce1611..8a5e555a5 100644
--- a/app/xkbcomp/xkbpath.c
+++ b/app/xkbcomp/xkbpath.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
@@ -212,7 +212,7 @@ XkbAddDirectoryToPath(const char *dir)
     len = strlen(dir);
     if (len + 2 >= PATH_MAX)
     {                           /* allow for '/' and at least one character */
-        ERROR2("Path entry (%s) too long (maximum length is %d)\n",
+        ERROR("Path entry (%s) too long (maximum length is %d)\n",
                dir, PATH_MAX - 3);
         return False;
     }
@@ -230,7 +230,7 @@ XkbAddDirectoryToPath(const char *dir)
         (char *) calloc(strlen(dir) + 1, sizeof(char));
     if (includePath[nPathEntries] == NULL)
     {
-        WSGO1("Allocation failed (includePath[%d])\n", nPathEntries);
+        WSGO("Allocation failed (includePath[%d])\n", nPathEntries);
         return False;
     }
     strcpy(includePath[nPathEntries++], dir);
@@ -317,7 +317,7 @@ XkbAddFileToCache(char *name, unsigned type, char *path, void *data)
         if ((type == entry->type) && (uStringEqual(name, entry->name)))
         {
             void *old = entry->data;
-            WSGO2("Replacing file cache entry (%s/%d)\n", name, type);
+            WSGO("Replacing file cache entry (%s/%d)\n", name, type);
             entry->path = path;
             entry->data = data;
             return old;
@@ -392,7 +392,7 @@ XkbFindFileInPath(char *name, unsigned type, char **pathRtrn)
 
         if ((nameLen + typeLen + pathLen + 2) >= PATH_MAX)
         {
-            ERROR3("File name (%s/%s/%s) too long\n", includePath[i],
+            ERROR("File name (%s/%s/%s) too long\n", includePath[i],
                    typeDir, name);
             ACTION("Ignored\n");
             continue;
diff --git a/app/xkbcomp/xkbscan.c b/app/xkbcomp/xkbscan.c
index e320c5bcc..9780159e5 100644
--- a/app/xkbcomp/xkbscan.c
+++ b/app/xkbcomp/xkbscan.c
@@ -6,19 +6,19 @@
  fee is hereby granted, provided that the above copyright
  notice appear in all copies and that both that copyright
  notice and this permission notice appear in supporting
- documentation, and that the name of Silicon Graphics not be 
- used in advertising or publicity pertaining to distribution 
+ documentation, and that the name of Silicon Graphics not be
+ used in advertising or publicity pertaining to distribution
  of the software without specific prior written permission.
- Silicon Graphics makes no representation about the suitability 
+ Silicon Graphics makes no representation about the suitability
  of this software for any purpose. It is provided "as is"
  without any express or implied warranty.
- 
- SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
  AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
- GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
- DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+ GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
  THE USE OR PERFORMANCE OF THIS SOFTWARE.