--- rxvt-unicode/src/xdefaults.C	2011/02/21 07:41:04	1.150
+++ rxvt-unicode/src/xdefaults.C	2011/04/30 13:11:34	1.153
@@ -407,7 +407,7 @@
               if (optList[i].arg)
                 len = strlen (optList[i].arg) + 1;
               assert (optList[i].opt != NULL);
-              len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2: 0);
+              len += 4 + strlen (optList[i].opt) + (optList_isBool (i) ? 2 : 0);
               col += len;
               if (col > 79)
                 {
@@ -463,7 +463,6 @@
 
   rxvt_log ("\n\n");
   rxvt_exit_failure ();
-  /* NOTREACHED */
 }
 
 /*}}} */
@@ -524,7 +523,7 @@
           if (optList_isString (entry))
             {
               /*
-               * special cases are handled in main.c:main () to allow
+               * special cases are handled in init_resources () to allow
                * X resources to set these values before we settle for
                * default values
                */
@@ -587,7 +586,6 @@
  *      "rxvt" "keysym" "0xFF01"
  *   value will be a string
  */
-/* ARGSUSED */
 int
 rxvt_define_key (XrmDatabase *database UNUSED,
                  XrmBindingList bindings UNUSED,