Update usage of CHECK_ macros (remove unused second argument).

author: Pavel Janík 2001-11-02 20:46:55 +0000
committer: Pavel Janík 2001-11-02 20:46:55 +0000
commit: b78265036088d5d0eac2a03b929adb50aa59b45c (patch)
tree: de99fe733144deb926fd31ee7bdff95cb1bc5073 /src
parent: 00a2cef7d11a1b193891eb3d28274ef7fc7c3fe4 (diff)
download: emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.tar.gz
emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.zip
55 files changed, 863 insertions, 863 deletions
diff --git a/src/abbrev.c b/src/abbrev.c
index ec92e4d5d6f..51623ade93c 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -97,7 +97,7 @@ DEFUN ("clear-abbrev-table", Fclear_abbrev_table, Sclear_abbrev_table, 1, 1, 0,
 {
  int i, size;
-  CHECK_VECTOR (table, 0);
+  CHECK_VECTOR (table);
  size = XVECTOR (table)->size;
  abbrevs_changed = 1;
  for (i = 0; i < size; i++)
@@ -120,13 +120,13 @@ which is incremented each time the abbrev is used.  */)
     Lisp_Object table, name, expansion, hook, count;
 {
  Lisp_Object sym, oexp, ohook, tem;
-  CHECK_VECTOR (table, 0);
+  CHECK_VECTOR (table);
-  CHECK_STRING (name, 1);
+  CHECK_STRING (name);
  if (NILP (count))
    count = make_number (0);
  else
-    CHECK_NUMBER (count, 0);
+    CHECK_NUMBER (count);
  sym = Fintern (name, table);
@@ -183,7 +183,7 @@ The default is to try buffer's mode-specific abbrev table, then global table.  *
     Lisp_Object abbrev, table;
 {
  Lisp_Object sym;
-  CHECK_STRING (abbrev, 0);
+  CHECK_STRING (abbrev);
  if (!NILP (table))
    sym = Fintern_soft (abbrev, table);
  else
@@ -244,7 +244,7 @@ Returns the abbrev symbol, if expansion took place.  */)
  if (!NILP (Vabbrev_start_location))
    {
      tem = Vabbrev_start_location;
-      CHECK_NUMBER_COERCE_MARKER (tem, 0);
+      CHECK_NUMBER_COERCE_MARKER (tem);
      wordstart = XINT (tem);
      Vabbrev_start_location = Qnil;
      if (wordstart < BEGV || wordstart > ZV)
@@ -479,9 +479,9 @@ define the abbrev table NAME exactly as it is currently defined.  */)
  Lisp_Object table;
  Lisp_Object stream;
-  CHECK_SYMBOL (name, 0);
+  CHECK_SYMBOL (name);
  table = Fsymbol_value (name);
-  CHECK_VECTOR (table, 0);
+  CHECK_VECTOR (table);
  XSETBUFFER (stream, current_buffer);
@@ -516,7 +516,7 @@ of the form (ABBREVNAME EXPANSION HOOK USECOUNT).  */)
  Lisp_Object name, exp, hook, count;
  Lisp_Object table, elt;
-  CHECK_SYMBOL (tablename, 0);
+  CHECK_SYMBOL (tablename);
  table = Fboundp (tablename);
  if (NILP (table) || (table = Fsymbol_value (tablename), NILP (table)))
    {
@@ -524,7 +524,7 @@ of the form (ABBREVNAME EXPANSION HOOK USECOUNT).  */)
      Fset (tablename, table);
      Vabbrev_table_name_list = Fcons (tablename, Vabbrev_table_name_list);
    }
-  CHECK_VECTOR (table, 0);
+  CHECK_VECTOR (table);
  for (; !NILP (definitions); definitions = Fcdr (definitions))
    {
diff --git a/src/alloc.c b/src/alloc.c
index 6340761c880..3545f5256f2 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1668,8 +1668,8 @@ Both LENGTH and INIT must be numbers.  */)
  register unsigned char *p, *end;
  int c, nbytes;
-  CHECK_NATNUM (length, 0);
+  CHECK_NATNUM (length);
-  CHECK_NUMBER (init, 1);
+  CHECK_NUMBER (init);
  c = XINT (init);
  if (SINGLE_BYTE_CHAR_P (c))
@@ -1713,7 +1713,7 @@ LENGTH must be a number.  INIT matters only in whether it is t or nil.  */)
  int real_init, i;
  int length_in_chars, length_in_elts, bits_per_value;
-  CHECK_NATNUM (length, 0);
+  CHECK_NATNUM (length);
  bits_per_value = sizeof (EMACS_INT) * BITS_PER_CHAR;
@@ -2157,7 +2157,7 @@ DEFUN ("make-list", Fmake_list, Smake_list, 2, 2, 0,
  register Lisp_Object val;
  register int size;
-  CHECK_NATNUM (length, 0);
+  CHECK_NATNUM (length);
  size = XFASTINT (length);
  val = Qnil;
@@ -2347,7 +2347,7 @@ See also the function `vector'.  */)
  register int index;
  register struct Lisp_Vector *p;
-  CHECK_NATNUM (length, 0);
+  CHECK_NATNUM (length);
  sizei = XFASTINT (length);
  p = allocate_vector (sizei);
@@ -2369,9 +2369,9 @@ The property's value should be an integer between 0 and 10.  */)
 {
  Lisp_Object vector;
  Lisp_Object n;
-  CHECK_SYMBOL (purpose, 1);
+  CHECK_SYMBOL (purpose);
  n = Fget (purpose, Qchar_table_extra_slots);
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  if (XINT (n) < 0 || XINT (n) > 10)
    args_out_of_range (n, Qnil);
  /* Add 2 to the size for the defalt and parent slots.  */
@@ -2521,7 +2521,7 @@ Its value and function definition are void, and its property list is nil.  */)
  register Lisp_Object val;
  register struct Lisp_Symbol *p;
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  if (symbol_free_list)
    {
diff --git a/src/buffer.c b/src/buffer.c
index f3b6d5f735f..2207adcf406 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -220,7 +220,7 @@ If the optional arg FRAME is a frame, we return that frame's buffer list.  */)
    {
      Lisp_Object tail;
-      CHECK_FRAME (frame, 1);
+      CHECK_FRAME (frame);
      framelist = Fcopy_sequence (XFRAME (frame)->buffer_list);
@@ -267,7 +267,7 @@ NAME may also be a buffer; if so, the value is that buffer.  */)
 {
  if (BUFFERP (name))
    return name;
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist));
 }
@@ -283,7 +283,7 @@ See also `find-buffer-visiting'.  */)
  register Lisp_Object tail, buf, tem;
  Lisp_Object handler;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  filename = Fexpand_file_name (filename, Qnil);
  /* If the file name has special constructs in it,
@@ -739,7 +739,7 @@ even if a buffer with that name exists.  */)
  int count;
  char number[10];
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  tem = Fget_buffer (name);
  if (NILP (tem))
@@ -768,7 +768,7 @@ With no argument or nil as argument, return the name of the current buffer.  */)
 {
  if (NILP (buffer))
    return current_buffer->name;
-  CHECK_BUFFER (buffer, 0);
+  CHECK_BUFFER (buffer);
  return XBUFFER (buffer)->name;
 }
@@ -780,7 +780,7 @@ No argument or nil as argument means use the current buffer.  */)
 {
  if (NILP (buffer))
    return current_buffer->filename;
-  CHECK_BUFFER (buffer, 0);
+  CHECK_BUFFER (buffer);
  return XBUFFER (buffer)->filename;
 }
@@ -798,7 +798,7 @@ If BUFFER is not indirect, return nil.  */)
    base = current_buffer->base_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
      base = XBUFFER (buffer)->base_buffer;
    }
@@ -825,7 +825,7 @@ No argument or nil as argument means use current buffer as BUFFER.  */)
    buf = current_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
      buf = XBUFFER (buffer);
    }
@@ -892,7 +892,7 @@ No argument or nil as argument means use current buffer as BUFFER.  */)
    buf = current_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
      buf = XBUFFER (buffer);
    }
@@ -994,7 +994,7 @@ No argument or nil as argument means use current buffer as BUFFER.  */)
    buf = current_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
      buf = XBUFFER (buffer);
    }
@@ -1016,7 +1016,7 @@ This does not change the name of the visited file (if any).  */)
 {
  register Lisp_Object tem, buf;
-  CHECK_STRING (newname, 0);
+  CHECK_STRING (newname);
  if (XSTRING (newname)->size == 0)
    error ("Empty string is invalid as a buffer name");
@@ -1903,8 +1903,8 @@ void
 validate_region (b, e)
     register Lisp_Object *b, *e;
 {
-  CHECK_NUMBER_COERCE_MARKER (*b, 0);
+  CHECK_NUMBER_COERCE_MARKER (*b);
-  CHECK_NUMBER_COERCE_MARKER (*e, 1);
+  CHECK_NUMBER_COERCE_MARKER (*e);
  if (XINT (*b) > XINT (*e))
    {
@@ -3371,7 +3371,7 @@ rear delimiter advance when text is inserted there.  */)
  if (NILP (buffer))
    XSETBUFFER (buffer, current_buffer);
  else
-    CHECK_BUFFER (buffer, 2);
+    CHECK_BUFFER (buffer);
  if (MARKERP (beg)
      && ! EQ (Fmarker_buffer (beg), buffer))
    error ("Marker points into wrong buffer");
@@ -3379,8 +3379,8 @@ rear delimiter advance when text is inserted there.  */)
      && ! EQ (Fmarker_buffer (end), buffer))
    error ("Marker points into wrong buffer");
-  CHECK_NUMBER_COERCE_MARKER (beg, 1);
+  CHECK_NUMBER_COERCE_MARKER (beg);
-  CHECK_NUMBER_COERCE_MARKER (end, 1);
+  CHECK_NUMBER_COERCE_MARKER (end);
  if (XINT (beg) > XINT (end))
    {
@@ -3462,12 +3462,12 @@ buffer.  */)
  Lisp_Object obuffer;
  int count = specpdl_ptr - specpdl;
-  CHECK_OVERLAY (overlay, 0);
+  CHECK_OVERLAY (overlay);
  if (NILP (buffer))
    buffer = Fmarker_buffer (OVERLAY_START (overlay));
  if (NILP (buffer))
    XSETBUFFER (buffer, current_buffer);
-  CHECK_BUFFER (buffer, 3);
+  CHECK_BUFFER (buffer);
  if (MARKERP (beg)
      && ! EQ (Fmarker_buffer (beg), buffer))
@@ -3476,8 +3476,8 @@ buffer.  */)
      && ! EQ (Fmarker_buffer (end), buffer))
    error ("Marker points into wrong buffer");
-  CHECK_NUMBER_COERCE_MARKER (beg, 1);
+  CHECK_NUMBER_COERCE_MARKER (beg);
-  CHECK_NUMBER_COERCE_MARKER (end, 1);
+  CHECK_NUMBER_COERCE_MARKER (end);
  if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate)))
    return Fdelete_overlay (overlay);
@@ -3563,7 +3563,7 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0,
  struct buffer *b;
  int count = specpdl_ptr - specpdl;
-  CHECK_OVERLAY (overlay, 0);
+  CHECK_OVERLAY (overlay);
  buffer = Fmarker_buffer (OVERLAY_START (overlay));
  if (NILP (buffer))
@@ -3599,7 +3599,7 @@ DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0,
     (overlay)
     Lisp_Object overlay;
 {
-  CHECK_OVERLAY (overlay, 0);
+  CHECK_OVERLAY (overlay);
  return (Fmarker_position (OVERLAY_START (overlay)));
 }
@@ -3609,7 +3609,7 @@ DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0,
     (overlay)
     Lisp_Object overlay;
 {
-  CHECK_OVERLAY (overlay, 0);
+  CHECK_OVERLAY (overlay);
  return (Fmarker_position (OVERLAY_END (overlay)));
 }
@@ -3619,7 +3619,7 @@ DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0,
     (overlay)
       Lisp_Object overlay;
 {
-  CHECK_OVERLAY (overlay, 0);
+  CHECK_OVERLAY (overlay);
  return Fmarker_buffer (OVERLAY_START (overlay));
 }
@@ -3631,7 +3631,7 @@ OVERLAY.  */)
     (overlay)
    Lisp_Object overlay;
 {
-  CHECK_OVERLAY (overlay, 0);
+  CHECK_OVERLAY (overlay);
  return Fcopy_sequence (XOVERLAY (overlay)->plist);
 }
@@ -3647,7 +3647,7 @@ DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0,
  int len;
  Lisp_Object result;
-  CHECK_NUMBER_COERCE_MARKER (pos, 0);
+  CHECK_NUMBER_COERCE_MARKER (pos);
  len = 10;
  /* We can't use alloca here because overlays_at can call xrealloc.  */
@@ -3679,8 +3679,8 @@ or between BEG and END.  */)
  int len;
  Lisp_Object result;
-  CHECK_NUMBER_COERCE_MARKER (beg, 0);
+  CHECK_NUMBER_COERCE_MARKER (beg);
-  CHECK_NUMBER_COERCE_MARKER (end, 0);
+  CHECK_NUMBER_COERCE_MARKER (end);
  len = 10;
  overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
@@ -3710,7 +3710,7 @@ If there are no more overlay boundaries after POS, return (point-max).  */)
  int len;
  int i;
-  CHECK_NUMBER_COERCE_MARKER (pos, 0);
+  CHECK_NUMBER_COERCE_MARKER (pos);
  len = 10;
  overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object));
@@ -3750,7 +3750,7 @@ If there are no more overlay boundaries before POS, return (point-min).  */)
  Lisp_Object *overlay_vec;
  int len;
-  CHECK_NUMBER_COERCE_MARKER (pos, 0);
+  CHECK_NUMBER_COERCE_MARKER (pos);
  /* At beginning of buffer, we know the answer;
     avoid bug subtracting 1 below.  */
@@ -3797,7 +3797,7 @@ DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0,
     (pos)
     Lisp_Object pos;
 {
-  CHECK_NUMBER_COERCE_MARKER (pos, 0);
+  CHECK_NUMBER_COERCE_MARKER (pos);
  recenter_overlay_lists (current_buffer, XINT (pos));
  return Qnil;
@@ -3810,7 +3810,7 @@ DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0,
 {
  Lisp_Object plist, fallback;
-  CHECK_OVERLAY (overlay, 0);
+  CHECK_OVERLAY (overlay);
  fallback = Qnil;
@@ -3840,7 +3840,7 @@ DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0,
  Lisp_Object tail, buffer;
  int changed;
-  CHECK_OVERLAY (overlay, 0);
+  CHECK_OVERLAY (overlay);
  buffer = Fmarker_buffer (OVERLAY_START (overlay));
diff --git a/src/bytecode.c b/src/bytecode.c
index c356eb3a262..c926a3237a6 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -447,10 +447,10 @@ If the third argument is incorrect, Emacs may crash.  */)
 }
 #endif
-  CHECK_STRING (bytestr, 0);
+  CHECK_STRING (bytestr);
  if (!VECTORP (vector))
    vector = wrong_type_argument (Qvectorp, vector);
-  CHECK_NUMBER (maxdepth, 2);
+  CHECK_NUMBER (maxdepth);
  if (STRING_MULTIBYTE (bytestr))
    /* BYTESTR must have been produced by Emacs 20.2 or the earlier
@@ -895,7 +895,7 @@ If the third argument is incorrect, Emacs may crash.  */)
        case Btemp_output_buffer_setup:
          BEFORE_POTENTIAL_GC ();
-          CHECK_STRING (TOP, 0);
+          CHECK_STRING (TOP);
          temp_output_buffer_setup (XSTRING (TOP)->data);
          AFTER_POTENTIAL_GC ();
          TOP = Vstandard_output;
@@ -920,7 +920,7 @@ If the third argument is incorrect, Emacs may crash.  */)
            BEFORE_POTENTIAL_GC ();
            v1 = POP;
            v2 = TOP;
-            CHECK_NUMBER (v2, 0);
+            CHECK_NUMBER (v2);
            AFTER_POTENTIAL_GC ();
            op = XINT (v2);
            immediate_quit = 1;
@@ -1152,8 +1152,8 @@ If the third argument is incorrect, Emacs may crash.  */)
            Lisp_Object v1, v2;
            BEFORE_POTENTIAL_GC ();
            v2 = POP; v1 = TOP;
-            CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (v1, 0);
+            CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (v1);
-            CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (v2, 0);
+            CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (v2);
            AFTER_POTENTIAL_GC ();
            if (FLOATP (v1) || FLOATP (v2))
              {
@@ -1434,7 +1434,7 @@ If the third argument is incorrect, Emacs may crash.  */)
        case Bchar_syntax:
          BEFORE_POTENTIAL_GC ();
-          CHECK_NUMBER (TOP, 0);
+          CHECK_NUMBER (TOP);
          AFTER_POTENTIAL_GC ();
          XSETFASTINT (TOP, syntax_code_spec[(int) SYNTAX (XINT (TOP))]);
          break;
@@ -1563,7 +1563,7 @@ If the third argument is incorrect, Emacs may crash.  */)
                BEFORE_POTENTIAL_GC ();
                v2 = POP;
                v1 = TOP;
-                CHECK_NUMBER (v2, 0);
+                CHECK_NUMBER (v2);
                AFTER_POTENTIAL_GC ();
                op = XINT (v2);
                immediate_quit = 1;
diff --git a/src/callint.c b/src/callint.c
index 30036ea5b3a..f84d0048877 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -223,7 +223,7 @@ supply if the command inquires which events were used to invoke it.  */)
    keys = this_command_keys, key_count = this_command_key_count;
  else
    {
-      CHECK_VECTOR (keys, 3);
+      CHECK_VECTOR (keys);
      key_count = XVECTOR (keys)->size;
    }
diff --git a/src/callproc.c b/src/callproc.c
index 6798caba8b0..21cfc11dd66 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -247,7 +247,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
  /* Qt denotes that Ffind_operation_coding_system is not yet called.  */
  coding_systems = Qt;
-  CHECK_STRING (args[0], 0);
+  CHECK_STRING (args[0]);
  error_file = Qt;
@@ -269,7 +269,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
        int must_encode = 0;
        for (i = 4; i < nargs; i++)
-          CHECK_STRING (args[i], i);
+          CHECK_STRING (args[i]);
        for (i = 4; i < nargs; i++)
          if (STRING_MULTIBYTE (args[i]))
@@ -299,7 +299,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
  if (nargs >= 2 && ! NILP (args[1]))
    {
      infile = Fexpand_file_name (args[1], current_buffer->directory);
-      CHECK_STRING (infile, 1);
+      CHECK_STRING (infile);
    }
  else
    infile = build_string (NULL_DEVICE);
@@ -335,8 +335,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
          buffer = Fget_buffer_create (buffer);
          /* Mention the buffer name for a better error message.  */
          if (NILP (buffer))
-            CHECK_BUFFER (spec_buffer, 2);
+            CHECK_BUFFER (spec_buffer);
-          CHECK_BUFFER (buffer, 2);
+          CHECK_BUFFER (buffer);
        }
    }
  else 
@@ -1419,7 +1419,7 @@ This function consults the variable ``process-environment'' for its value.  */)
  char *value;
  int valuelen;
-  CHECK_STRING (var, 0);
+  CHECK_STRING (var);
  if (getenv_internal (XSTRING (var)->data, STRING_BYTES (XSTRING (var)),
                       &value, &valuelen))
    return make_string (value, valuelen);
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 47f355461a8..c449547bf1d 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -354,7 +354,7 @@ operate_on_word (arg, newpoint)
  int farend;
  int iarg;
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
  iarg = XINT (arg);
  farend = scan_words (PT, iarg);
  if (!farend)
diff --git a/src/category.c b/src/category.c
index 40804367528..f99a300f7b0 100644
--- a/src/category.c
+++ b/src/category.c
@@ -63,7 +63,7 @@ those categories.  */)
  Lisp_Object val;
  int len;
-  CHECK_STRING (categories, 0);
+  CHECK_STRING (categories);
  val = MAKE_CATEGORY_SET;
  if (STRING_MULTIBYTE (categories))
@@ -75,7 +75,7 @@ those categories.  */)
      Lisp_Object category;
      XSETFASTINT (category, XSTRING (categories)->data[len]);
-      CHECK_CATEGORY (category, 0);
+      CHECK_CATEGORY (category);
      SET_CATEGORY_SET (val, category, Qt);
    }
  return val;
@@ -95,8 +95,8 @@ The category is defined only in category table TABLE, which defaults to
     (category, docstring, table)
     Lisp_Object category, docstring, table;
 {
-  CHECK_CATEGORY (category, 0);
+  CHECK_CATEGORY (category);
-  CHECK_STRING (docstring, 1);
+  CHECK_STRING (docstring);
  table = check_category_table (table);
  if (!NILP (CATEGORY_DOCSTRING (table, XFASTINT (category))))
@@ -111,7 +111,7 @@ DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0,
     (category, table)
     Lisp_Object category, table;
 {
-  CHECK_CATEGORY (category, 0);
+  CHECK_CATEGORY (category);
  table = check_category_table (table);
  return CATEGORY_DOCSTRING (table, XFASTINT (category));
@@ -285,7 +285,7 @@ DEFUN ("char-category-set", Fchar_category_set, Schar_category_set, 1, 1, 0,
     (ch)
     Lisp_Object ch;
 {
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  return CATEGORY_SET (XFASTINT (ch));
 }
@@ -301,7 +301,7 @@ The return value is a string containing those same categories.  */)
  int i, j;
  char str[96];
-  CHECK_CATEGORY_SET (category_set, 0);
+  CHECK_CATEGORY_SET (category_set);
  j = 0;
  for (i = 32; i < 127; i++)
@@ -369,9 +369,9 @@ then delete CATEGORY from the category set instead of adding it.  */)
  Lisp_Object set_value;        /* Actual value to be set in category sets.  */
  Lisp_Object val, category_set;
-  CHECK_NUMBER (character, 0);
+  CHECK_NUMBER (character);
  c = XINT (character);
-  CHECK_CATEGORY (category, 1);
+  CHECK_CATEGORY (category);
  table = check_category_table (table);
  if (NILP (CATEGORY_DOCSTRING (table, XFASTINT (category))))
diff --git a/src/ccl.c b/src/ccl.c
index e8ddc959d2c..d2cf59e62a8 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -2056,7 +2056,7 @@ programs.  */)
  if (setup_ccl_program (&ccl, ccl_prog) < 0)
    error ("Invalid CCL program");
-  CHECK_VECTOR (reg, 1);
+  CHECK_VECTOR (reg);
  if (XVECTOR (reg)->size != 8)
    error ("Length of vector REGISTERS is not 8");
@@ -2114,10 +2114,10 @@ See the documentation of `define-ccl-program' for the detail of CCL program.  */
  if (setup_ccl_program (&ccl, ccl_prog) < 0)
    error ("Invalid CCL program");
-  CHECK_VECTOR (status, 1);
+  CHECK_VECTOR (status);
  if (XVECTOR (status)->size != 9)
    error ("Length of vector STATUS is not 9");
-  CHECK_STRING (str, 2);
+  CHECK_STRING (str);
  GCPRO2 (status, str);
@@ -2178,11 +2178,11 @@ Return index number of the registered CCL program.  */)
  int idx;
  Lisp_Object resolved;
-  CHECK_SYMBOL (name, 0);
+  CHECK_SYMBOL (name);
  resolved = Qnil;
  if (!NILP (ccl_prog))
    {
-      CHECK_VECTOR (ccl_prog, 1);
+      CHECK_VECTOR (ccl_prog);
      resolved = resolve_symbol_ccl_program (ccl_prog);
      if (NILP (resolved))
        error ("Error in CCL program");
@@ -2261,8 +2261,8 @@ Return index number of the registered map.  */)
  int i;
  Lisp_Object index;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
-  CHECK_VECTOR (map, 1);
+  CHECK_VECTOR (map);
  
  for (i = 0; i < len; i++)
    {
diff --git a/src/charset.c b/src/charset.c
index 445ecbd1296..b691cc9da65 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -667,9 +667,9 @@ DESCRIPTION (string) is the description string of the charset.  */)
  Lisp_Object *vec;
  if (!NILP (charset_id))
-    CHECK_NUMBER (charset_id, 0);
+    CHECK_NUMBER (charset_id);
-  CHECK_SYMBOL (charset_symbol, 1);
+  CHECK_SYMBOL (charset_symbol);
-  CHECK_VECTOR (info_vector, 2);
+  CHECK_VECTOR (info_vector);
  if (! NILP (charset_id))
    {
@@ -734,8 +734,8 @@ return nil.  */)
 {
  int final_char;
-  CHECK_NUMBER (dimension, 0);
+  CHECK_NUMBER (dimension);
-  CHECK_NUMBER (chars, 1);
+  CHECK_NUMBER (chars);
  if (XINT (dimension) != 1 && XINT (dimension) != 2)
    error ("Invalid charset dimension %d, it should be 1 or 2",
           XINT (dimension));
@@ -759,10 +759,10 @@ CHARSET should be defined by `defined-charset' in advance.  */)
 {
  int charset;
-  CHECK_NUMBER (dimension, 0);
+  CHECK_NUMBER (dimension);
-  CHECK_NUMBER (chars, 1);
+  CHECK_NUMBER (chars);
-  CHECK_NUMBER (final_char, 2);
+  CHECK_NUMBER (final_char);
-  CHECK_SYMBOL (charset_symbol, 3);
+  CHECK_SYMBOL (charset_symbol);
  if (XINT (dimension) != 1 && XINT (dimension) != 2)
    error ("Invalid DIMENSION %d, it should be 1 or 2", XINT (dimension));
@@ -932,7 +932,7 @@ only `ascii', `eight-bit-control', and `eight-bit-graphic'.  */)
  int i;
  Lisp_Object val;
-  CHECK_STRING (str, 0);
+  CHECK_STRING (str);
  bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
  find_charset_in_text (XSTRING (str)->data, XSTRING (str)->size,
@@ -958,7 +958,7 @@ Internal use only.  */)
 {
  int charset_id, c1, c2;
-  CHECK_NUMBER (charset, 0);
+  CHECK_NUMBER (charset);
  charset_id = XINT (charset);
  if (!CHARSET_DEFINED_P (charset_id))
    error ("Invalid charset ID: %d", XINT (charset));
@@ -967,14 +967,14 @@ Internal use only.  */)
    c1 = 0;
  else
    {
-      CHECK_NUMBER (code1, 1);
+      CHECK_NUMBER (code1);
      c1 = XINT (code1);
    }
  if (NILP (code2))
    c2 = 0;
  else
    {
-      CHECK_NUMBER (code2, 2);
+      CHECK_NUMBER (code2);
      c2 = XINT (code2);
    }
@@ -1025,7 +1025,7 @@ return a list of symbol `unknown' and CHAR.  */)
 {
  int c, charset, c1, c2;
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  c = XFASTINT (ch);
  if (!CHAR_VALID_P (c, 1))
    return Fcons (Qunknown, Fcons (ch, Qnil));
@@ -1041,7 +1041,7 @@ DEFUN ("char-charset", Fchar_charset, Schar_charset, 1, 1, 0,
     (ch)
     Lisp_Object ch;
 {
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  return CHARSET_SYMBOL (CHAR_CHARSET (XINT (ch)));
 }
@@ -1076,9 +1076,9 @@ DIMENSION, CHARS, and FINAL-CHAR.  */)
 {
  int charset;
-  CHECK_NUMBER (dimension, 0);
+  CHECK_NUMBER (dimension);
-  CHECK_NUMBER (chars, 1);
+  CHECK_NUMBER (chars);
-  CHECK_NUMBER (final_char, 2);
+  CHECK_NUMBER (final_char);
  if ((charset = ISO_CHARSET_TABLE (dimension, chars, final_char)) < 0)
    return Qnil;
@@ -1137,7 +1137,7 @@ The conversion is done based on `nonascii-translation-table' (which see)
 {
  int c;
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  c = XINT (ch);
  if (c < 0 || c >= 0400)
    error ("Invalid unibyte character: %d", c);
@@ -1157,7 +1157,7 @@ The conversion is done based on `nonascii-translation-table' (which see)
 {
  int c;
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  c = XINT (ch);
  if (! CHAR_VALID_P (c, 0))
    error ("Invalid multibyte character: %d", c);
@@ -1173,7 +1173,7 @@ This is now an obsolete function.  We keep it just for backward compatibility.
     (ch)
     Lisp_Object ch;
 {
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  return make_number (1);
 }
@@ -1223,7 +1223,7 @@ Tab is taken to occupy `tab-width' columns.  */)
  int c;
  struct Lisp_Char_Table *dp = buffer_display_table ();
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  c = XINT (ch);
@@ -1401,7 +1401,7 @@ taken to occupy `tab-width' columns.  */)
 {
  Lisp_Object val;
-  CHECK_STRING (str, 0);
+  CHECK_STRING (str);
  XSETFASTINT (val, lisp_string_width (str, -1, NULL, NULL));
  return val;
 }
@@ -1414,7 +1414,7 @@ The returned value is 0 for left-to-right and 1 for right-to-left.  */)
 {
  int charset;
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  charset = CHAR_CHARSET (XFASTINT (ch));
  if (!CHARSET_DEFINED_P (charset))
    invalid_character (XINT (ch));
@@ -1428,8 +1428,8 @@ DEFUN ("chars-in-region", Fchars_in_region, Schars_in_region, 2, 2, 0,
 {
  int from, to;
-  CHECK_NUMBER_COERCE_MARKER (beg, 0);
+  CHECK_NUMBER_COERCE_MARKER (beg);
-  CHECK_NUMBER_COERCE_MARKER (end, 1);
+  CHECK_NUMBER_COERCE_MARKER (end);
  from = min (XFASTINT (beg), XFASTINT (end));
  to = max (XFASTINT (beg), XFASTINT (end));
@@ -1643,7 +1643,7 @@ usage: (string &rest CHARACTERS)  */)
  for (i = 0; i < n; i++)
    {
-      CHECK_NUMBER (args[i], 0);
+      CHECK_NUMBER (args[i]);
      if (!multibyte && !SINGLE_BYTE_CHAR_P (XFASTINT (args[i])))
        multibyte = 1;
    }
diff --git a/src/cmds.c b/src/cmds.c
index 791b410eb5b..36e1c8944ef 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -48,7 +48,7 @@ DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
  (n)
     Lisp_Object n;
 {
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  return make_number (PT + XINT (n));
 }
@@ -62,7 +62,7 @@ On reaching end of buffer, stop and signal error.")
  if (NILP (n))
    XSETFASTINT (n, 1);
  else
-    CHECK_NUMBER (n, 0);
+    CHECK_NUMBER (n);
  /* This used to just set point to point + XINT (n), and then check
     to see if it was within boundaries.  But now that SET_PT can
@@ -98,7 +98,7 @@ On attempt to pass beginning or end of buffer, stop and signal error.")
  if (NILP (n))
    XSETFASTINT (n, 1);
  else
-    CHECK_NUMBER (n, 0);
+    CHECK_NUMBER (n);
  XSETINT (n, - XINT (n));
  return Fforward_char (n);
@@ -123,7 +123,7 @@ With positive N, a non-empty line at the end counts as one line\n\
    count = 1;
  else
    {
-      CHECK_NUMBER (n, 0);
+      CHECK_NUMBER (n);
      count = XINT (n);
    }
@@ -168,7 +168,7 @@ boundaries.  */)
  if (NILP (n))
    XSETFASTINT (n, 1);
  else
-    CHECK_NUMBER (n, 0);
+    CHECK_NUMBER (n);
  SET_PT (XINT (Fline_beginning_position (n)));
  
@@ -190,7 +190,7 @@ boundaries bind `inhibit-field-text-motion' to t.  */)
  if (NILP (n))
    XSETFASTINT (n, 1);
  else
-    CHECK_NUMBER (n, 0);
+    CHECK_NUMBER (n);
  SET_PT (XINT (Fline_end_position (n)));
@@ -207,7 +207,7 @@ N was explicitly specified.")
 {
  int pos;
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  pos = PT + XINT (n);
  if (NILP (killflag))
@@ -247,7 +247,7 @@ N was explicitly specified.")
  int deleted_special = 0;
  int pos, pos_byte, i;
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  /* See if we are about to delete a tab or newline backwards.  */
  pos = PT;
@@ -294,7 +294,7 @@ Whichever character you type to run this command is inserted.")
 {
  int character = XINT (last_command_char);
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  /* Barf if the key that invoked this was not a character.  */
  if (!INTEGERP (last_command_char))
diff --git a/src/coding.c b/src/coding.c
index 78ba80c35ee..e94a65006cc 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5741,7 +5741,7 @@ code_convert_region (from, from_byte, to, to_byte, coding, encodep, replace)
      inhibit_pre_post_conversion = 0;
      /* Discard the unwind protect.  */
      specpdl_ptr--;
-      CHECK_NUMBER (val, 0);
+      CHECK_NUMBER (val);
      inserted += Z - prev_Z;
    }
@@ -6148,7 +6148,7 @@ The value of property should be a vector of length 5.")
  (coding_system)
     Lisp_Object coding_system;
 {
-  CHECK_SYMBOL (coding_system, 0);
+  CHECK_SYMBOL (coding_system);
  if (!NILP (Fcoding_system_p (coding_system)))
    return coding_system;
  while (1)
@@ -6236,8 +6236,8 @@ highest priority.")
  int from_byte, to_byte;
  int include_anchor_byte = 0;
-  CHECK_NUMBER_COERCE_MARKER (start, 0);
+  CHECK_NUMBER_COERCE_MARKER (start);
-  CHECK_NUMBER_COERCE_MARKER (end, 1);
+  CHECK_NUMBER_COERCE_MARKER (end);
  validate_region (&start, &end);
  from = XINT (start), to = XINT (end);
@@ -6276,7 +6276,7 @@ highest priority.")
  (string, highest)
     Lisp_Object string, highest;
 {
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  return detect_coding_system (XSTRING (string)->data,
                               /* "+ 1" is to include the anchor byte
@@ -6386,8 +6386,8 @@ DEFUN ("find-coding-systems-region-internal",
    {
      int from, to, stop;
-      CHECK_NUMBER_COERCE_MARKER (start, 0);
+      CHECK_NUMBER_COERCE_MARKER (start);
-      CHECK_NUMBER_COERCE_MARKER (end, 1);
+      CHECK_NUMBER_COERCE_MARKER (end);
      if (XINT (start) < BEG || XINT (end) > Z || XINT (start) > XINT (end))
        args_out_of_range (start, end);
      if (NILP (current_buffer->enable_multibyte_characters))
@@ -6453,9 +6453,9 @@ code_convert_region1 (start, end, coding_system, encodep)
  struct coding_system coding;
  int from, to;
-  CHECK_NUMBER_COERCE_MARKER (start, 0);
+  CHECK_NUMBER_COERCE_MARKER (start);
-  CHECK_NUMBER_COERCE_MARKER (end, 1);
+  CHECK_NUMBER_COERCE_MARKER (end);
-  CHECK_SYMBOL (coding_system, 2);
+  CHECK_SYMBOL (coding_system);
  validate_region (&start, &end);
  from = XFASTINT (start);
@@ -6513,8 +6513,8 @@ code_convert_string1 (string, coding_system, nocopy, encodep)
 {
  struct coding_system coding;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
-  CHECK_SYMBOL (coding_system, 1);
+  CHECK_SYMBOL (coding_system);
  if (NILP (coding_system))
    return (NILP (nocopy) ? Fcopy_sequence (string) : string);
@@ -6572,8 +6572,8 @@ code_convert_string_norecord (string, coding_system, encodep)
 {
  struct coding_system coding;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
-  CHECK_SYMBOL (coding_system, 1);
+  CHECK_SYMBOL (coding_system);
  if (NILP (coding_system))
    return string;
@@ -6597,7 +6597,7 @@ Return the corresponding character.")
  unsigned char c1, c2, s1, s2;
  Lisp_Object val;
-  CHECK_NUMBER (code, 0);
+  CHECK_NUMBER (code);
  s1 = (XFASTINT (code)) >> 8, s2 = (XFASTINT (code)) & 0xFF;
  if (s1 == 0)
    {
@@ -6628,7 +6628,7 @@ Return the corresponding code in SJIS.")
  int charset, c1, c2, s1, s2;
  Lisp_Object val;
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  SPLIT_CHAR (XFASTINT (ch), charset, c1, c2);
  if (charset == CHARSET_ASCII)
    {
@@ -6660,7 +6660,7 @@ Return the corresponding character.")
  unsigned char b1, b2, c1, c2;
  Lisp_Object val;
-  CHECK_NUMBER (code, 0);
+  CHECK_NUMBER (code);
  b1 = (XFASTINT (code)) >> 8, b2 = (XFASTINT (code)) & 0xFF;
  if (b1 == 0)
    {
@@ -6688,7 +6688,7 @@ Return the corresponding character code in Big5.")
  int charset, c1, c2, b1, b2;
  Lisp_Object val;
-  CHECK_NUMBER (ch, 0);
+  CHECK_NUMBER (ch);
  SPLIT_CHAR (XFASTINT (ch), charset, c1, c2);
  if (charset == CHARSET_ASCII)
    {
@@ -6713,7 +6713,7 @@ DEFUN ("set-terminal-coding-system-internal",
  (coding_system)
     Lisp_Object coding_system;
 {
-  CHECK_SYMBOL (coding_system, 0);
+  CHECK_SYMBOL (coding_system);
  setup_coding_system (Fcheck_coding_system (coding_system), &terminal_coding);
  /* We had better not send unsafe characters to terminal.  */
  terminal_coding.flags |= CODING_FLAG_ISO_SAFE;
@@ -6732,7 +6732,7 @@ DEFUN ("set-safe-terminal-coding-system-internal",
  (coding_system)
     Lisp_Object coding_system;
 {
-  CHECK_SYMBOL (coding_system, 0);
+  CHECK_SYMBOL (coding_system);
  setup_coding_system (Fcheck_coding_system (coding_system),
                       &safe_terminal_coding);
  /* Character composition should be disabled.  */
@@ -6758,7 +6758,7 @@ DEFUN ("set-keyboard-coding-system-internal",
  (coding_system)
     Lisp_Object coding_system;
 {
-  CHECK_SYMBOL (coding_system, 0);
+  CHECK_SYMBOL (coding_system);
  setup_coding_system (Fcheck_coding_system (coding_system), &keyboard_coding);
  /* Character composition should be disabled.  */
  keyboard_coding.composing = COMPOSITION_DISABLED;
diff --git a/src/composite.c b/src/composite.c
index ff6d1a5ba34..1c67a2ca107 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -730,7 +730,7 @@ for the composition.   See `compose-region' for more detial.")
      && !INTEGERP (components)
      && !CONSP (components)
      && !STRINGP (components))
-    CHECK_VECTOR (components, 2);
+    CHECK_VECTOR (components);
  compose_text (XINT (start), XINT (end), components, mod_func, Qnil);
  return Qnil;
@@ -746,9 +746,9 @@ for the composition.   See `compose-string' for more detial.")
  (string, start, end, components, mod_func)
     Lisp_Object string, start, end, components, mod_func;
 {
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
-  CHECK_NUMBER (start, 1);
+  CHECK_NUMBER (start);
-  CHECK_NUMBER (end, 2);
+  CHECK_NUMBER (end);
  if (XINT (start) < 0 ||
      XINT (start) > XINT (end)
@@ -772,11 +772,11 @@ See `find-composition' for more detail.")
  int start, end;
  int id;
-  CHECK_NUMBER_COERCE_MARKER (pos, 0);
+  CHECK_NUMBER_COERCE_MARKER (pos);
  start = XINT (pos);
  if (!NILP (limit))
    {
-      CHECK_NUMBER_COERCE_MARKER (limit, 1);
+      CHECK_NUMBER_COERCE_MARKER (limit);
      end = XINT (limit);
    }
  else
@@ -784,7 +784,7 @@ See `find-composition' for more detail.")
  
  if (!NILP (string))
    {
-      CHECK_STRING (string, 2);
+      CHECK_STRING (string);
      if (XINT (pos) < 0 || XINT (pos) > XSTRING (string)->size)
        args_out_of_range (string, pos);
    }
diff --git a/src/data.c b/src/data.c
index cf916141d35..b130129967f 100644
--- a/src/data.c
+++ b/src/data.c
@@ -616,7 +616,7 @@ DEFUN ("boundp", Fboundp, Sboundp, 1, 1, 0,
     register Lisp_Object symbol;
 {
  Lisp_Object valcontents;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  valcontents = SYMBOL_VALUE (symbol);
@@ -632,7 +632,7 @@ DEFUN ("fboundp", Ffboundp, Sfboundp, 1, 1, 0,
     (symbol)
     register Lisp_Object symbol;
 {
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  return (EQ (XSYMBOL (symbol)->function, Qunbound) ? Qnil : Qt);
 }
@@ -641,7 +641,7 @@ DEFUN ("makunbound", Fmakunbound, Smakunbound, 1, 1, 0,
     (symbol)
     register Lisp_Object symbol;
 {
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  if (XSYMBOL (symbol)->constant)
    return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
  Fset (symbol, Qunbound);
@@ -653,7 +653,7 @@ DEFUN ("fmakunbound", Ffmakunbound, Sfmakunbound, 1, 1, 0,
     (symbol)
     register Lisp_Object symbol;
 {
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  if (NILP (symbol) || EQ (symbol, Qt))
    return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
  XSYMBOL (symbol)->function = Qunbound;
@@ -665,7 +665,7 @@ DEFUN ("symbol-function", Fsymbol_function, Ssymbol_function, 1, 1, 0,
     (symbol)
     register Lisp_Object symbol;
 {
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  if (EQ (XSYMBOL (symbol)->function, Qunbound))
    return Fsignal (Qvoid_function, Fcons (symbol, Qnil));
  return XSYMBOL (symbol)->function;
@@ -676,7 +676,7 @@ DEFUN ("symbol-plist", Fsymbol_plist, Ssymbol_plist, 1, 1, 0,
     (symbol)
     register Lisp_Object symbol;
 {
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  return XSYMBOL (symbol)->plist;
 }
@@ -687,7 +687,7 @@ DEFUN ("symbol-name", Fsymbol_name, Ssymbol_name, 1, 1, 0,
 {
  register Lisp_Object name;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  XSETSTRING (name, XSYMBOL (symbol)->name);
  return name;
 }
@@ -697,7 +697,7 @@ DEFUN ("fset", Ffset, Sfset, 2, 2, 0,
     (symbol, definition)
     register Lisp_Object symbol, definition;
 {
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  if (NILP (symbol) || EQ (symbol, Qt))
    return Fsignal (Qsetting_constant, Fcons (symbol, Qnil));
  if (!NILP (Vautoload_queue) && !EQ (XSYMBOL (symbol)->function, Qunbound))
@@ -729,7 +729,7 @@ DEFUN ("setplist", Fsetplist, Ssetplist, 2, 2, 0,
     (symbol, newplist)
     register Lisp_Object symbol, newplist;
 {
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  XSYMBOL (symbol)->plist = newplist;
  return newplist;
 }
@@ -874,7 +874,7 @@ store_symval_forwarding (symbol, valcontents, newval, buf)
      switch (XMISCTYPE (valcontents))
        {
        case Lisp_Misc_Intfwd:
-          CHECK_NUMBER (newval, 1);
+          CHECK_NUMBER (newval);
          *XINTFWD (valcontents)->intvar = XINT (newval);
          if (*XINTFWD (valcontents)->intvar != XINT (newval))
            error ("Value out of range for variable `%s'",
@@ -1029,7 +1029,7 @@ find_symbol_value (symbol)
  register Lisp_Object valcontents;
  register Lisp_Object val;
  
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  valcontents = SYMBOL_VALUE (symbol);
  if (BUFFER_LOCAL_VALUEP (valcontents)
@@ -1134,7 +1134,7 @@ set_internal (symbol, newval, buf, bindflag)
  if (NILP (buf->name))
    return newval;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  if (SYMBOL_CONSTANT_P (symbol)
      && (NILP (Fkeywordp (symbol))
          || !EQ (newval, SYMBOL_VALUE (symbol))))
@@ -1275,7 +1275,7 @@ default_value (symbol)
 {
  register Lisp_Object valcontents;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  valcontents = SYMBOL_VALUE (symbol);
  /* For a built-in buffer-local variable, get the default value
@@ -1346,7 +1346,7 @@ for this variable.  */)
 {
  register Lisp_Object valcontents, current_alist_element, alist_element_buffer;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  valcontents = SYMBOL_VALUE (symbol);
  /* Handle variables like case-fold-search that have special slots
@@ -1448,7 +1448,7 @@ The function `default-value' gets the default value and `set-default' sets it.
 {
  register Lisp_Object tem, valcontents, newval;
-  CHECK_SYMBOL (variable, 0);
+  CHECK_SYMBOL (variable);
  valcontents = SYMBOL_VALUE (variable);
  if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
@@ -1501,7 +1501,7 @@ Instead, use `add-hook' and specify t for the LOCAL argument.  */)
 {
  register Lisp_Object tem, valcontents;
-  CHECK_SYMBOL (variable, 0);
+  CHECK_SYMBOL (variable);
  valcontents = SYMBOL_VALUE (variable);
  if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents))
@@ -1580,7 +1580,7 @@ From now on the default value will apply in this buffer.  */)
 {
  register Lisp_Object tem, valcontents;
-  CHECK_SYMBOL (variable, 0);
+  CHECK_SYMBOL (variable);
  valcontents = SYMBOL_VALUE (variable);
@@ -1643,7 +1643,7 @@ See `modify-frame-parameters'.  */)
 {
  register Lisp_Object tem, valcontents, newval;
-  CHECK_SYMBOL (variable, 0);
+  CHECK_SYMBOL (variable);
  valcontents = SYMBOL_VALUE (variable);
  if (EQ (variable, Qnil) || EQ (variable, Qt) || KBOARD_OBJFWDP (valcontents)
@@ -1688,11 +1688,11 @@ BUFFER defaults to the current buffer.  */)
    buf = current_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
      buf = XBUFFER (buffer);
    }
-  CHECK_SYMBOL (variable, 0);
+  CHECK_SYMBOL (variable);
  valcontents = SYMBOL_VALUE (variable);
  if (BUFFER_LOCAL_VALUEP (valcontents)
@@ -1732,11 +1732,11 @@ BUFFER defaults to the current buffer.  */)
    buf = current_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
      buf = XBUFFER (buffer);
    }
-  CHECK_SYMBOL (variable, 0);
+  CHECK_SYMBOL (variable);
  valcontents = SYMBOL_VALUE (variable);
@@ -1826,7 +1826,7 @@ or a byte-code object.  IDX starts at 0.  */)
 {
  register int idxval;
-  CHECK_NUMBER (idx, 1);
+  CHECK_NUMBER (idx);
  idxval = XINT (idx);
  if (STRINGP (array))
    {
@@ -1957,7 +1957,7 @@ IDX starts at 0.  */)
 {
  register int idxval;
-  CHECK_NUMBER (idx, 1);
+  CHECK_NUMBER (idx);
  idxval = XINT (idx);
  if (!VECTORP (array) && !STRINGP (array) && !BOOL_VECTOR_P (array)
      && ! CHAR_TABLE_P (array))
@@ -2033,7 +2033,7 @@ IDX starts at 0.  */)
      if (idxval < 0 || idxval >= XSTRING (array)->size)
        args_out_of_range (array, idx);
-      CHECK_NUMBER (newelt, 2);
+      CHECK_NUMBER (newelt);
      idxval_byte = string_char_to_byte (array, idxval);
      p1 = &XSTRING (array)->data[idxval_byte];
@@ -2067,7 +2067,7 @@ IDX starts at 0.  */)
    {
      if (idxval < 0 || idxval >= XSTRING (array)->size)
        args_out_of_range (array, idx);
-      CHECK_NUMBER (newelt, 2);
+      CHECK_NUMBER (newelt);
      if (XINT (newelt) < 0 || SINGLE_BYTE_CHAR_P (XINT (newelt)))
        XSTRING (array)->data[idxval] = XINT (newelt);
@@ -2120,8 +2120,8 @@ arithcompare (num1, num2, comparison)
  double f1 = 0, f2 = 0;
  int floatp = 0;
-  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1, 0);
+  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num1);
-  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2, 0);
+  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (num2);
  if (FLOATP (num1) || FLOATP (num2))
    {
@@ -2222,7 +2222,7 @@ DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0,
     (number)
     register Lisp_Object number;
 {
-  CHECK_NUMBER_OR_FLOAT (number, 0);
+  CHECK_NUMBER_OR_FLOAT (number);
  if (FLOATP (number))
    {
@@ -2274,7 +2274,7 @@ NUMBER may be an integer or a floating point number.  */)
 {
  char buffer[VALBITS];
-  CHECK_NUMBER_OR_FLOAT (number, 0);
+  CHECK_NUMBER_OR_FLOAT (number);
  if (FLOATP (number))
    {
@@ -2330,13 +2330,13 @@ If the base used is not 10, floating point is not recognized.  */)
  int sign = 1;
  Lisp_Object val;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  if (NILP (base))
    b = 10;
  else
    {
-      CHECK_NUMBER (base, 1);
+      CHECK_NUMBER (base);
      b = XINT (base);
      if (b < 2 || b > 16)
        Fsignal (Qargs_out_of_range, Fcons (base, Qnil));
@@ -2427,7 +2427,7 @@ arith_driver (code, nargs, args)
    {
      /* Using args[argnum] as argument to CHECK_NUMBER_... */
      val = args[argnum];
-      CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val, argnum);
+      CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val);
      if (FLOATP (val))
        return float_arith_driver ((double) accum, argnum, code,
@@ -2496,7 +2496,7 @@ float_arith_driver (accum, argnum, code, nargs, args)
  for (; argnum < nargs; argnum++)
    {
      val = args[argnum];    /* using args[argnum] as argument to CHECK_NUMBER_... */
-      CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val, argnum);
+      CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (val);
      if (FLOATP (val))
        {
@@ -2598,8 +2598,8 @@ Both must be integers or markers.  */)
 {
  Lisp_Object val;
-  CHECK_NUMBER_COERCE_MARKER (x, 0);
+  CHECK_NUMBER_COERCE_MARKER (x);
-  CHECK_NUMBER_COERCE_MARKER (y, 1);
+  CHECK_NUMBER_COERCE_MARKER (y);
  if (XFASTINT (y) == 0)
    Fsignal (Qarith_error, Qnil);
@@ -2641,8 +2641,8 @@ Both X and Y must be numbers or markers.  */)
  Lisp_Object val;
  EMACS_INT i1, i2;
-  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (x, 0);
+  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (x);
-  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (y, 1);
+  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (y);
  if (FLOATP (x) || FLOATP (y))
    return fmod_float (x, y);
@@ -2727,8 +2727,8 @@ In this case, the sign bit is duplicated.  */)
 {
  register Lisp_Object val;
-  CHECK_NUMBER (value, 0);
+  CHECK_NUMBER (value);
-  CHECK_NUMBER (count, 1);
+  CHECK_NUMBER (count);
  if (XINT (count) >= BITS_PER_EMACS_INT)
    XSETINT (val, 0);
@@ -2750,8 +2750,8 @@ In this case,  zeros are shifted in on the left.  */)
 {
  register Lisp_Object val;
-  CHECK_NUMBER (value, 0);
+  CHECK_NUMBER (value);
-  CHECK_NUMBER (count, 1);
+  CHECK_NUMBER (count);
  if (XINT (count) >= BITS_PER_EMACS_INT)
    XSETINT (val, 0);
@@ -2770,7 +2770,7 @@ Markers are converted to integers.  */)
     (number)
     register Lisp_Object number;
 {
-  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number, 0);
+  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number);
  if (FLOATP (number))
    return (make_float (1.0 + XFLOAT_DATA (number)));
@@ -2785,7 +2785,7 @@ Markers are converted to integers.  */)
     (number)
     register Lisp_Object number;
 {
-  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number, 0);
+  CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number);
  if (FLOATP (number))
    return (make_float (-1.0 + XFLOAT_DATA (number)));
@@ -2799,7 +2799,7 @@ DEFUN ("lognot", Flognot, Slognot, 1, 1, 0,
     (number)
     register Lisp_Object number;
 {
-  CHECK_NUMBER (number, 0);
+  CHECK_NUMBER (number);
  XSETINT (number, ~XINT (number));
  return number;
 }
diff --git a/src/dired.c b/src/dired.c
index 2dc13188b1e..eb10f7f1fea 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -156,7 +156,7 @@ directory_files_internal (directory, full, match, nosort, attrs)
  if (!NILP (match))
    {
-      CHECK_STRING (match, 3);
+      CHECK_STRING (match);
      /* MATCH might be a flawed regular expression.  Rather than
         catching and signaling our own errors, we just call
@@ -488,7 +488,7 @@ file_name_completion (file, dirname, all_flag, ver_flag)
    readfunc = readdirver;
  file = Fupcase (file);
 #else  /* not VMS */
-  CHECK_STRING (file, 0);
+  CHECK_STRING (file);
 #endif /* not VMS */
 #ifdef FILE_SYSTEM_CASE
diff --git a/src/dispnew.c b/src/dispnew.c
index f5324b10818..04e9a031a93 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3300,7 +3300,7 @@ DEFUN ("redraw-frame", Fredraw_frame, Sredraw_frame, 1, 1, 0,
 {
  struct frame *f;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  /* Ignore redraw requests, if frame has no glyphs yet.
@@ -6023,7 +6023,7 @@ Control characters in STRING will have terminal-dependent effects.  */)
     Lisp_Object string;
 {
  /* ??? Perhaps we should do something special for multibyte strings here.  */
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  fwrite (XSTRING (string)->data, 1, STRING_BYTES (XSTRING (string)), stdout);
  fflush (stdout);
  if (termscript)
@@ -6090,7 +6090,7 @@ Emacs was built without floating point support.
  if (NILP (milliseconds))
    XSETINT (milliseconds, 0);
  else
-    CHECK_NUMBER (milliseconds, 1);
+    CHECK_NUMBER (milliseconds);
  usec = XINT (milliseconds) * 1000;
  {
@@ -6217,7 +6217,7 @@ Value is t if waited the full time with no input arriving.  */)
  if (NILP (milliseconds))
    XSETINT (milliseconds, 0);
  else
-    CHECK_NUMBER (milliseconds, 1);
+    CHECK_NUMBER (milliseconds);
  usec = XINT (milliseconds) * 1000;
  {
@@ -6536,7 +6536,7 @@ don't show a cursor.  */)
      if (NILP (window))
        window = selected_window;
      else
-        CHECK_WINDOW (window, 2);
+        CHECK_WINDOW (window);
      
      XWINDOW (window)->cursor_off_p = NILP (show);
    }
@@ -6557,7 +6557,7 @@ WINDOW nil or omitted means report on the selected window.  */)
  if (NILP (window))
    window = selected_window;
  else
-    CHECK_WINDOW (window, 2);
+    CHECK_WINDOW (window);
  
  w = XWINDOW (window);
  return w->cursor_off_p ? Qnil : Qt;    
diff --git a/src/doc.c b/src/doc.c
index 0dd4fbbc398..49ef925bcc7 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -484,13 +484,13 @@ when doc strings are referred to later in the dumped Emacs.")
    error ("Snarf-documentation can only be called in an undumped Emacs");
 #endif
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
 #ifndef CANNOT_DUMP
  name = (char *) alloca (XSTRING (filename)->size + 14);
  strcpy (name, "../etc/");
 #else /* CANNOT_DUMP */
-  CHECK_STRING (Vdoc_directory, 0);
+  CHECK_STRING (Vdoc_directory);
  name = (char *) alloca (XSTRING (filename)->size +
                          XSTRING (Vdoc_directory)->size + 1);
  strcpy (name, XSTRING (Vdoc_directory)->data);
@@ -600,7 +600,7 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
  if (NILP (string))
    return Qnil;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  tem = Qnil;
  keymap = Qnil;
  name = Qnil;
diff --git a/src/dosfns.c b/src/dosfns.c
index f67a2450a26..783b1214437 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -65,13 +65,13 @@ REGISTERS should be a vector produced by `make-register' and\n\
  union REGS inregs, outregs;
  Lisp_Object val;
-  CHECK_NUMBER (interrupt, 0);
+  CHECK_NUMBER (interrupt);
  no = (unsigned long) XINT (interrupt);
-  CHECK_VECTOR (registers, 1);
+  CHECK_VECTOR (registers);
  if (no < 0 || no > 0xff || XVECTOR (registers)-> size != 8) 
    return Qnil;
  for (i = 0; i < 8; i++)
-    CHECK_NUMBER (XVECTOR (registers)->contents[i], 1);
+    CHECK_NUMBER (XVECTOR (registers)->contents[i]);
  inregs.x.ax    = (unsigned long) XFASTINT (XVECTOR (registers)->contents[0]);
  inregs.x.bx    = (unsigned long) XFASTINT (XVECTOR (registers)->contents[1]);
@@ -107,9 +107,9 @@ Return the updated VECTOR.")
  char *buf;
  Lisp_Object val;
-  CHECK_NUMBER (address, 0);
+  CHECK_NUMBER (address);
  offs = (unsigned long) XINT (address);
-  CHECK_VECTOR (vector, 1);
+  CHECK_VECTOR (vector);
  len = XVECTOR (vector)-> size;
  if (len < 1 || len > 2048 || address < 0 || address > 0xfffff - len) 
    return Qnil;
@@ -132,9 +132,9 @@ DEFUN ("msdos-memput", Fdos_memput, Sdos_memput, 2, 2, 0,
  char *buf;
  Lisp_Object val;
-  CHECK_NUMBER (address, 0);
+  CHECK_NUMBER (address);
  offs = (unsigned long) XINT (address);
-  CHECK_VECTOR (vector, 1);
+  CHECK_VECTOR (vector);
  len = XVECTOR (vector)-> size;
  if (len < 1 || len > 2048 || address < 0 || address > 0xfffff - len) 
    return Qnil;
@@ -142,7 +142,7 @@ DEFUN ("msdos-memput", Fdos_memput, Sdos_memput, 2, 2, 0,
  for (i = 0; i < len; i++)
    {
-      CHECK_NUMBER (XVECTOR (vector)->contents[i], 1);
+      CHECK_NUMBER (XVECTOR (vector)->contents[i]);
      buf[i] = (unsigned char) XFASTINT (XVECTOR (vector)->contents[i]) & 0xFF;
    }
@@ -158,7 +158,7 @@ The current keyboard layout is available in dos-keyboard-code.")
  (country_code, allkeys)
  Lisp_Object country_code;
 {
-  CHECK_NUMBER (country_code, 0);
+  CHECK_NUMBER (country_code);
  if (!dos_set_keyboard (XINT (country_code), !NILP (allkeys)))
    return Qnil;
  return Qt;
@@ -524,7 +524,7 @@ If the underlying system call fails, value is nil.")
  struct statfs stfs;
  Lisp_Object encoded, value;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  filename = Fexpand_file_name (filename, Qnil);
  encoded = ENCODE_FILE (filename);
diff --git a/src/editfns.c b/src/editfns.c
index 77bb39df691..6dd998dc2d3 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -172,7 +172,7 @@ usage: (char-to-string CHAR)  */)
  int len;
  unsigned char str[MAX_MULTIBYTE_LENGTH];
-  CHECK_NUMBER (character, 0);
+  CHECK_NUMBER (character);
  len = (SINGLE_BYTE_CHAR_P (XFASTINT (character))
         ? (*str = (unsigned char)(XFASTINT (character)), 1)
@@ -188,7 +188,7 @@ A multibyte character is handled correctly.  */)
 {
  register Lisp_Object val;
  register struct Lisp_String *p;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  p = XSTRING (string);
  if (p->size)
    {
@@ -266,7 +266,7 @@ except in the case that `enable-multibyte-characters' is nil.  */)
      return position;
    }
-  CHECK_NUMBER_COERCE_MARKER (position, 0);
+  CHECK_NUMBER_COERCE_MARKER (position);
  pos = clip_to_bounds (BEGV, XINT (position), ZV);
  SET_PT (pos);
@@ -435,7 +435,7 @@ find_field (pos, merge_at_boundary, beg, end)
  if (NILP (pos))
    XSETFASTINT (pos, PT);
  else
-    CHECK_NUMBER_COERCE_MARKER (pos, 0);
+    CHECK_NUMBER_COERCE_MARKER (pos);
  after_field
    = get_char_property_and_overlay (pos, Qfield, Qnil, &after_overlay);
@@ -689,8 +689,8 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil.  */)
      int fwd, shortage;
      Lisp_Object field_bound;
-      CHECK_NUMBER_COERCE_MARKER (new_pos, 0);
+      CHECK_NUMBER_COERCE_MARKER (new_pos);
-      CHECK_NUMBER_COERCE_MARKER (old_pos, 0);
+      CHECK_NUMBER_COERCE_MARKER (old_pos);
      fwd = (XFASTINT (new_pos) > XFASTINT (old_pos));
@@ -748,7 +748,7 @@ This function does not move point.  */)
  if (NILP (n))
    XSETFASTINT (n, 1);
  else
-    CHECK_NUMBER (n, 0);
+    CHECK_NUMBER (n);
  orig = PT;
  orig_byte = PT_BYTE;
@@ -783,7 +783,7 @@ This function does not move point.  */)
  if (NILP (n))
    XSETFASTINT (n, 1);
  else
-    CHECK_NUMBER (n, 0);
+    CHECK_NUMBER (n);
  end_pos = find_before_next_newline (orig, 0, XINT (n) - (XINT (n) <= 0));
@@ -942,7 +942,7 @@ If BUFFER, return the number of characters in that buffer instead.  */)
    return make_number (Z - BEG);
  else
    {
-      CHECK_BUFFER (buffer, 1);
+      CHECK_BUFFER (buffer);
      return make_number (BUF_Z (XBUFFER (buffer))
                          - BUF_BEG (XBUFFER (buffer)));
    }
@@ -1012,7 +1012,7 @@ If POSITION is out of range, the value is nil.  */)
     (position)
     Lisp_Object position;
 {
-  CHECK_NUMBER_COERCE_MARKER (position, 1);
+  CHECK_NUMBER_COERCE_MARKER (position);
  if (XINT (position) < BEG || XINT (position) > Z)
    return Qnil;
  return make_number (CHAR_TO_BYTE (XINT (position)));
@@ -1024,7 +1024,7 @@ If BYTEPOS is out of range, the value is nil.  */)
     (bytepos)
     Lisp_Object bytepos;
 {
-  CHECK_NUMBER (bytepos, 1);
+  CHECK_NUMBER (bytepos);
  if (XINT (bytepos) < BEG_BYTE || XINT (bytepos) > Z_BYTE)
    return Qnil;
  return make_number (BYTE_TO_CHAR (XINT (bytepos)));
@@ -1124,7 +1124,7 @@ If POS is out of range, the value is nil.  */)
    }
  else
    {
-      CHECK_NUMBER_COERCE_MARKER (pos, 0);
+      CHECK_NUMBER_COERCE_MARKER (pos);
      if (XINT (pos) < BEGV || XINT (pos) >= ZV)
        return Qnil;
@@ -1159,7 +1159,7 @@ If POS is out of range, the value is nil.  */)
    }
  else
    {
-      CHECK_NUMBER_COERCE_MARKER (pos, 0);
+      CHECK_NUMBER_COERCE_MARKER (pos);
      if (XINT (pos) <= BEGV || XINT (pos) > ZV)
        return Qnil;
@@ -1202,7 +1202,7 @@ with that uid, or nil if there is no such user.  */)
  if (NILP (uid))
    return Vuser_login_name;
-  CHECK_NUMBER (uid, 0);
+  CHECK_NUMBER (uid);
  pw = (struct passwd *) getpwuid (XINT (uid));
  return (pw ? build_string (pw->pw_name) : Qnil);
 }
@@ -1366,7 +1366,7 @@ lisp_time_argument (specified_time, result, usec)
    {
      Lisp_Object high, low;
      high = Fcar (specified_time);
-      CHECK_NUMBER (high, 0);
+      CHECK_NUMBER (high);
      low = Fcdr (specified_time);
      if (CONSP (low))
        {
@@ -1379,7 +1379,7 @@ lisp_time_argument (specified_time, result, usec)
                *usec = 0;
              else
                {
-                  CHECK_NUMBER (usec_l, 0);
+                  CHECK_NUMBER (usec_l);
                  *usec = XINT (usec_l);
                }
            }
@@ -1387,7 +1387,7 @@ lisp_time_argument (specified_time, result, usec)
        }
      else if (usec)
        *usec = 0;
-      CHECK_NUMBER (low, 0);
+      CHECK_NUMBER (low);
      *result = (XINT (high) << 16) + (XINT (low) & 0xffff);
      return *result >> 16 == XINT (high);
    }
@@ -1527,7 +1527,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".  */)
  struct tm *tm;
  int ut = ! NILP (universal);
-  CHECK_STRING (format_string, 1);
+  CHECK_STRING (format_string);
  if (! lisp_time_argument (time, &value, NULL))
    error ("Invalid time specification");
@@ -1639,12 +1639,12 @@ usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE)  */)
  struct tm tm;
  Lisp_Object zone = (nargs > 6 ? args[nargs - 1] : Qnil);
-  CHECK_NUMBER (args[0], 0);    /* second */
+  CHECK_NUMBER (args[0]);       /* second */
-  CHECK_NUMBER (args[1], 1);    /* minute */
+  CHECK_NUMBER (args[1]);       /* minute */
-  CHECK_NUMBER (args[2], 2);    /* hour */
+  CHECK_NUMBER (args[2]);       /* hour */
-  CHECK_NUMBER (args[3], 3);    /* day */
+  CHECK_NUMBER (args[3]);       /* day */
-  CHECK_NUMBER (args[4], 4);    /* month */
+  CHECK_NUMBER (args[4]);       /* month */
-  CHECK_NUMBER (args[5], 5);    /* year */
+  CHECK_NUMBER (args[5]);       /* year */
  tm.tm_sec = XINT (args[0]);
  tm.tm_min = XINT (args[1]);
@@ -1844,7 +1844,7 @@ If TZ is t, use Universal Time.  */)
    tzstring = "UTC0";
  else
    {
-      CHECK_STRING (tz, 0);
+      CHECK_STRING (tz);
      tzstring = (char *) XSTRING (tz)->data;
    }
@@ -2114,8 +2114,8 @@ from adjoining text, if those properties are sticky.  */)
  int len;
  unsigned char str[MAX_MULTIBYTE_LENGTH];
-  CHECK_NUMBER (character, 0);
+  CHECK_NUMBER (character);
-  CHECK_NUMBER (count, 1);
+  CHECK_NUMBER (count);
  if (!NILP (current_buffer->enable_multibyte_characters))
    len = CHAR_STRING (XFASTINT (character), str);
@@ -2326,14 +2326,14 @@ They default to the beginning and the end of BUFFER.  */)
    b = BUF_BEGV (bp);
  else
    {
-      CHECK_NUMBER_COERCE_MARKER (start, 0);
+      CHECK_NUMBER_COERCE_MARKER (start);
      b = XINT (start);
    }
  if (NILP (end))
    e = BUF_ZV (bp);
  else
    {
-      CHECK_NUMBER_COERCE_MARKER (end, 1);
+      CHECK_NUMBER_COERCE_MARKER (end);
      e = XINT (end);
    }
@@ -2392,14 +2392,14 @@ determines whether case is significant or ignored.  */)
    begp1 = BUF_BEGV (bp1);
  else
    {
-      CHECK_NUMBER_COERCE_MARKER (start1, 1);
+      CHECK_NUMBER_COERCE_MARKER (start1);
      begp1 = XINT (start1);
    }
  if (NILP (end1))
    endp1 = BUF_ZV (bp1);
  else
    {
-      CHECK_NUMBER_COERCE_MARKER (end1, 2);
+      CHECK_NUMBER_COERCE_MARKER (end1);
      endp1 = XINT (end1);
    }
@@ -2430,14 +2430,14 @@ determines whether case is significant or ignored.  */)
    begp2 = BUF_BEGV (bp2);
  else
    {
-      CHECK_NUMBER_COERCE_MARKER (start2, 4);
+      CHECK_NUMBER_COERCE_MARKER (start2);
      begp2 = XINT (start2);
    }
  if (NILP (end2))
    endp2 = BUF_ZV (bp2);
  else
    {
-      CHECK_NUMBER_COERCE_MARKER (end2, 5);
+      CHECK_NUMBER_COERCE_MARKER (end2);
      endp2 = XINT (end2);
    }
@@ -2547,8 +2547,8 @@ Both characters must have the same length of multi-byte form.  */)
  int multibyte_p = !NILP (current_buffer->enable_multibyte_characters);
  validate_region (&start, &end);
-  CHECK_NUMBER (fromchar, 2);
+  CHECK_NUMBER (fromchar);
-  CHECK_NUMBER (tochar, 3);
+  CHECK_NUMBER (tochar);
  if (multibyte_p)
    {
@@ -2712,7 +2712,7 @@ It returns the number of characters changed.  */)
  int multibyte = !NILP (current_buffer->enable_multibyte_characters);
  validate_region (&start, &end);
-  CHECK_STRING (table, 2);
+  CHECK_STRING (table);
  size = STRING_BYTES (XSTRING (table));
  tt = XSTRING (table)->data;
@@ -2830,8 +2830,8 @@ or markers) bounding the text that should remain visible.  */)
     (start, end)
     register Lisp_Object start, end;
 {
-  CHECK_NUMBER_COERCE_MARKER (start, 0);
+  CHECK_NUMBER_COERCE_MARKER (start);
-  CHECK_NUMBER_COERCE_MARKER (end, 1);
+  CHECK_NUMBER_COERCE_MARKER (end);
  if (XINT (start) > XINT (end))
    {
@@ -3103,12 +3103,12 @@ usage: (propertize STRING &rest PROPERTIES)  */)
  GCPRO2 (properties, string);
  /* First argument must be a string.  */
-  CHECK_STRING (args[0], 0);
+  CHECK_STRING (args[0]);
  string = Fcopy_sequence (args[0]);
  for (i = 1; i < nargs; i += 2)
    {
-      CHECK_SYMBOL (args[i], i);
+      CHECK_SYMBOL (args[i]);
      properties = Fcons (args[i], Fcons (args[i + 1], properties));
    }
@@ -3182,7 +3182,7 @@ usage: (format STRING &rest OBJECTS)  */)
    if (STRINGP (args[n]) && STRING_MULTIBYTE (args[n]))
      multibyte = 1;
-  CHECK_STRING (args[0], 0);
+  CHECK_STRING (args[0]);
  /* If we start out planning a unibyte result,
     and later find it has to be multibyte, we jump back to retry.  */
@@ -3577,8 +3577,8 @@ Case is ignored if `case-fold-search' is non-nil in the current buffer.  */)
     register Lisp_Object c1, c2;
 {
  int i1, i2;
-  CHECK_NUMBER (c1, 0);
+  CHECK_NUMBER (c1);
-  CHECK_NUMBER (c2, 1);
+  CHECK_NUMBER (c2);
  if (XINT (c1) == XINT (c2))
    return Qt;
diff --git a/src/emacs.c b/src/emacs.c
index 8ba9470f437..9a20a73a378 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1998,7 +1998,7 @@ This function exists on systems that use HAVE_SHM.  */)
  Lisp_Object tem;
  check_pure_size ();
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  filename = Fexpand_file_name (filename, Qnil);
  tem = Vpurify_flag;
@@ -2044,11 +2044,11 @@ You must run Emacs in batch mode in order to dump it.  */)
  symbol = intern ("command-line-process");
  specbind (symbol, Qnil);
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  filename = Fexpand_file_name (filename, Qnil);
  if (!NILP (symfile))
    {
-      CHECK_STRING (symfile, 0);
+      CHECK_STRING (symfile);
      if (XSTRING (symfile)->size)
        symfile = Fexpand_file_name (symfile, Qnil);
    }
diff --git a/src/eval.c b/src/eval.c
index 8071307b734..075bcf1d384 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -690,8 +690,8 @@ ALIASED nil means remove the alias; SYMBOL is unbound after that.  */)
 {
  struct Lisp_Symbol *sym;
  
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
-  CHECK_SYMBOL (aliased, 1);
+  CHECK_SYMBOL (aliased);
  if (SYMBOL_CONSTANT_P (symbol))
    error ("Cannot make a constant an alias");
@@ -1215,7 +1215,7 @@ usage: (condition-case VAR BODYFORM HANDLERS...)  */)
  var      = Fcar (args);
  bodyform = Fcar (Fcdr (args));
  handlers = Fcdr (Fcdr (args));
-  CHECK_SYMBOL (var, 0);
+  CHECK_SYMBOL (var);
  for (val = handlers; ! NILP (val); val = Fcdr (val))
    {
@@ -1825,8 +1825,8 @@ this does nothing and returns nil.  */)
  Lisp_Object args[4];
 #endif
-  CHECK_SYMBOL (function, 0);
+  CHECK_SYMBOL (function);
-  CHECK_STRING (file, 1);
+  CHECK_STRING (file);
  /* If function is defined and not as an autoload, don't override */
  if (!EQ (XSYMBOL (function)->function, Qunbound)
@@ -1888,7 +1888,7 @@ do_autoload (fundef, funname)
  struct gcpro gcpro1, gcpro2, gcpro3;
  fun = funname;
-  CHECK_SYMBOL (funname, 0);
+  CHECK_SYMBOL (funname);
  GCPRO3 (fun, funname, fundef);
  /* Preserve the match data.  */
@@ -2158,7 +2158,7 @@ usage: (apply FUNCTION &rest ARGUMENTS)  */)
  fun = args [0];
  funcall_args = 0;
  spread_arg = args [nargs - 1];
-  CHECK_LIST (spread_arg, nargs);
+  CHECK_LIST (spread_arg);
  
  numargs = XINT (Flength (spread_arg));
@@ -2960,7 +2960,7 @@ specbind (symbol, value)
  Lisp_Object ovalue;
  Lisp_Object valcontents;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  if (specpdl_ptr == specpdl + specpdl_size)
    grow_specpdl ();
@@ -3117,7 +3117,7 @@ top_level_value (symbol)
 {
  register struct specbinding *ptr = specpdl;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  for (; ptr != specpdl_ptr; ptr++)
    {
      if (EQ (ptr->symbol, symbol))
@@ -3132,7 +3132,7 @@ top_level_set (symbol, newval)
 {
  register struct specbinding *ptr = specpdl;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  for (; ptr != specpdl_ptr; ptr++)
    {
      if (EQ (ptr->symbol, symbol))
@@ -3155,7 +3155,7 @@ The debugger is entered when that frame exits, if the flag is non-nil.  */)
  register struct backtrace *backlist = backtrace_list;
  register int i;
-  CHECK_NUMBER (level, 0);
+  CHECK_NUMBER (level);
  for (i = 0; backlist && i < XINT (level); i++)
    {
@@ -3243,7 +3243,7 @@ If NFRAMES is more than the number of frames, the value is nil.  */)
  register int i;
  Lisp_Object tem;
-  CHECK_NATNUM (nframes, 0);
+  CHECK_NATNUM (nframes);
  /* Find the frame requested.  */
  for (i = 0; backlist && i < XFASTINT (nframes); i++)
diff --git a/src/fileio.c b/src/fileio.c
index 823ab018bcd..f9838396746 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -338,7 +338,7 @@ use the standard functions without calling themselves recursively.  */)
  /* This function must not munge the match data.  */
  Lisp_Object chain, inhibited_handlers;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  if (EQ (operation, Vinhibit_file_name_operation))
    inhibited_handlers = Vinhibit_file_name_handlers;
@@ -384,7 +384,7 @@ on VMS, perhaps instead a string ending in `:', `]' or `>'.  */)
  register unsigned char *p;
  Lisp_Object handler;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  /* If the file name has special constructs in it,
     call the corresponding file handler.  */
@@ -459,7 +459,7 @@ or the entire name if it contains no slash.  */)
  register unsigned char *beg, *p, *end;
  Lisp_Object handler;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  /* If the file name has special constructs in it,
     call the corresponding file handler.  */
@@ -614,7 +614,7 @@ On VMS, converts \"[X]FOO.DIR\" to \"[X.FOO]\", etc.  */)
  char *buf;
  Lisp_Object handler;
-  CHECK_STRING (file, 0);
+  CHECK_STRING (file);
  if (NILP (file))
    return Qnil;
@@ -805,7 +805,7 @@ it returns a file name such as \"[X]Y.DIR.1\".  */)
  char *buf;
  Lisp_Object handler;
-  CHECK_STRING (directory, 0);
+  CHECK_STRING (directory);
  if (NILP (directory))
    return Qnil;
@@ -870,7 +870,7 @@ make_temp_name (prefix, base64_p)
  char pidbuf[20];
  int pidlen;
     
-  CHECK_STRING (prefix, 0);
+  CHECK_STRING (prefix);
  /* VAL is created by adding 6 characters to PREFIX.  The first
     three are the PID of this process, in base 64, and the second
@@ -1019,7 +1019,7 @@ See also the function `substitute-in-file-name'.  */)
  int length;
  Lisp_Object handler;
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  /* If the file name has special constructs in it,
     call the corresponding file handler.  */
@@ -1686,7 +1686,7 @@ See also the function `substitute-in-file-name'.")
  int dots = 0;
 #endif /* VMS */
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
 #ifdef VMS
  /* Filenames on VMS are always upper case.  */
@@ -1862,7 +1862,7 @@ See also the function `substitute-in-file-name'.")
    {
      if (NILP (defalt))
        defalt = current_buffer->directory;
-      CHECK_STRING (defalt, 1);
+      CHECK_STRING (defalt);
      newdir = XSTRING (defalt)->data;
    }
@@ -2004,7 +2004,7 @@ duplicates what `expand-file-name' does.  */)
  unsigned char *xnm;
  Lisp_Object handler;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  /* If the file name has special constructs in it,
     call the corresponding file handler.  */
@@ -2318,8 +2318,8 @@ A prefix arg makes KEEP-TIME non-nil.  */)
  encoded_file = encoded_newname = Qnil;
  GCPRO4 (file, newname, encoded_file, encoded_newname);
-  CHECK_STRING (file, 0);
+  CHECK_STRING (file);
-  CHECK_STRING (newname, 1);
+  CHECK_STRING (newname);
  if (!NILP (Ffile_directory_p (newname)))
    newname = Fexpand_file_name (file, newname);
@@ -2472,7 +2472,7 @@ DEFUN ("make-directory-internal", Fmake_directory_internal,
  Lisp_Object handler;
  Lisp_Object encoded_dir;
-  CHECK_STRING (directory, 0);
+  CHECK_STRING (directory);
  directory = Fexpand_file_name (directory, Qnil);
  handler = Ffind_file_name_handler (directory, Qmake_directory_internal);
@@ -2502,7 +2502,7 @@ DEFUN ("delete-directory", Fdelete_directory, Sdelete_directory, 1, 1, "FDelete
  Lisp_Object handler;
  Lisp_Object encoded_dir;
-  CHECK_STRING (directory, 0);
+  CHECK_STRING (directory);
  directory = Fdirectory_file_name (Fexpand_file_name (directory, Qnil));
  handler = Ffind_file_name_handler (directory, Qdelete_directory);
@@ -2528,7 +2528,7 @@ If file has multiple names, it continues to exist with the other names.  */)
  Lisp_Object handler;
  Lisp_Object encoded_file;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  filename = Fexpand_file_name (filename, Qnil);
  handler = Ffind_file_name_handler (filename, Qdelete_file);
@@ -2579,8 +2579,8 @@ This is what happens in interactive use with M-x.  */)
  encoded_file = encoded_newname = Qnil;
  GCPRO4 (file, newname, encoded_file, encoded_newname);
-  CHECK_STRING (file, 0);
+  CHECK_STRING (file);
-  CHECK_STRING (newname, 1);
+  CHECK_STRING (newname);
  file = Fexpand_file_name (file, Qnil);
  newname = Fexpand_file_name (newname, Qnil);
@@ -2655,8 +2655,8 @@ This is what happens in interactive use with M-x.  */)
  GCPRO4 (file, newname, encoded_file, encoded_newname);
  encoded_file = encoded_newname = Qnil;
-  CHECK_STRING (file, 0);
+  CHECK_STRING (file);
-  CHECK_STRING (newname, 1);
+  CHECK_STRING (newname);
  file = Fexpand_file_name (file, Qnil);
  newname = Fexpand_file_name (newname, Qnil);
@@ -2718,8 +2718,8 @@ This happens for interactive use with M-x.  */)
  GCPRO4 (filename, linkname, encoded_filename, encoded_linkname);
  encoded_filename = encoded_linkname = Qnil;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
-  CHECK_STRING (linkname, 1);
+  CHECK_STRING (linkname);
  /* If the link target has a ~, we must expand it to get
     a truly valid file name.  Otherwise, do not expand;
     we want to permit links to relative file names.  */
@@ -2786,12 +2786,12 @@ If STRING is nil or a null string, the logical name NAME is deleted.  */)
     Lisp_Object name;
     Lisp_Object string;
 {
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  if (NILP (string))
    delete_logical_name (XSTRING (name)->data);
  else
    {
-      CHECK_STRING (string, 1);
+      CHECK_STRING (string);
      if (XSTRING (string)->size == 0)
        delete_logical_name (XSTRING (name)->data);
@@ -2812,8 +2812,8 @@ DEFUN ("sysnetunam", Fsysnetunam, Ssysnetunam, 2, 2, 0,
 {
  int netresult;
-  CHECK_STRING (path, 0);
+  CHECK_STRING (path);
-  CHECK_STRING (login, 0);
+  CHECK_STRING (login);
  netresult = netunam (XSTRING (path)->data, XSTRING (login)->data);
@@ -2833,7 +2833,7 @@ On Unix, this is a name starting with a `/' or a `~'.  */)
 {
  unsigned char *ptr;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  ptr = XSTRING (filename)->data;
  if (IS_DIRECTORY_SEP (*ptr) || *ptr == '~'
 #ifdef VMS
@@ -2920,7 +2920,7 @@ See also `file-readable-p' and `file-attributes'.  */)
  Lisp_Object handler;
  struct stat statbuf;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  absname = Fexpand_file_name (filename, Qnil);
  /* If the file name has special constructs in it,
@@ -2943,7 +2943,7 @@ For a directory, this means you can access files in that directory.  */)
  Lisp_Object absname;
  Lisp_Object handler;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  absname = Fexpand_file_name (filename, Qnil);
  /* If the file name has special constructs in it,
@@ -2969,7 +2969,7 @@ See also `file-exists-p' and `file-attributes'.  */)
  int flags;
  struct stat statbuf;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  absname = Fexpand_file_name (filename, Qnil);
  /* If the file name has special constructs in it,
@@ -3017,7 +3017,7 @@ DEFUN ("file-writable-p", Ffile_writable_p, Sfile_writable_p, 1, 1, 0,
  Lisp_Object handler;
  struct stat statbuf;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  absname = Fexpand_file_name (filename, Qnil);
  /* If the file name has special constructs in it,
@@ -3065,10 +3065,10 @@ If there is no error, we return nil.  */)
  Lisp_Object handler, encoded_filename, absname;
  int fd;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  absname = Fexpand_file_name (filename, Qnil);
-  CHECK_STRING (string, 1);
+  CHECK_STRING (string);
  /* If the file name has special constructs in it,
     call the corresponding file handler.  */
@@ -3100,7 +3100,7 @@ Otherwise returns nil.  */)
  Lisp_Object val;
  Lisp_Object handler;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  filename = Fexpand_file_name (filename, Qnil);
  /* If the file name has special constructs in it,
@@ -3287,7 +3287,7 @@ Only the 12 low bits of MODE are used.  */)
  Lisp_Object handler;
  absname = Fexpand_file_name (filename, current_buffer->directory);
-  CHECK_NUMBER (mode, 1);
+  CHECK_NUMBER (mode);
  /* If the file name has special constructs in it,
     call the corresponding file handler.  */
@@ -3310,7 +3310,7 @@ This setting is inherited by subprocesses.  */)
     (mode)
     Lisp_Object mode;
 {
-  CHECK_NUMBER (mode, 0);
+  CHECK_NUMBER (mode);
  umask ((~ XINT (mode)) & 0777);
@@ -3361,8 +3361,8 @@ otherwise, if FILE2 does not exist, the answer is t.  */)
  Lisp_Object handler;
  struct gcpro gcpro1, gcpro2;
-  CHECK_STRING (file1, 0);
+  CHECK_STRING (file1);
-  CHECK_STRING (file2, 0);
+  CHECK_STRING (file2);
  absname1 = Qnil;
  GCPRO2 (absname1, file2);
@@ -3542,7 +3542,7 @@ actually used.  */)
  GCPRO4 (filename, val, p, orig_filename);
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  filename = Fexpand_file_name (filename, Qnil);
  /* If the file name has special constructs in it,
@@ -3636,12 +3636,12 @@ actually used.  */)
    }
  if (!NILP (beg))
-    CHECK_NUMBER (beg, 0);
+    CHECK_NUMBER (beg);
  else
    XSETFASTINT (beg, 0);
  if (!NILP (end))
-    CHECK_NUMBER (end, 0);
+    CHECK_NUMBER (end);
  else
    {
      if (! not_regular)
@@ -4458,7 +4458,7 @@ actually used.  */)
          
      insval = call3 (Qformat_decode,
                      Qnil, make_number (inserted), visit);
-      CHECK_NUMBER (insval, 0);
+      CHECK_NUMBER (insval);
      inserted = XFASTINT (insval);
      
      if (!NILP (visit))
@@ -4484,7 +4484,7 @@ actually used.  */)
      insval = call1 (Fcar (p), make_number (inserted));
      if (!NILP (insval))
        {
-          CHECK_NUMBER (insval, 0);
+          CHECK_NUMBER (insval);
          inserted = XFASTINT (insval);
        }
      QUIT;
@@ -5290,7 +5290,7 @@ This means that the file has not been changed since it was visited or saved.  */
  Lisp_Object handler;
  Lisp_Object filename;
-  CHECK_BUFFER (buf, 0);
+  CHECK_BUFFER (buf);
  b = XBUFFER (buf);
  if (!STRINGP (b->filename)) return Qt;
@@ -5723,7 +5723,7 @@ DEFUN ("read-file-name-internal", Fread_file_name_internal, Sread_file_name_inte
  int changed;
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  realdir = dir;
  name = string;
@@ -5853,7 +5853,7 @@ provides a file dialog box.  */)
    }
  if (!NILP (default_filename))
    {
-      CHECK_STRING (default_filename, 3);
+      CHECK_STRING (default_filename);
      default_filename = double_dollars (default_filename);
    }
diff --git a/src/filelock.c b/src/filelock.c
index bdfcda9ade0..c1c4f88dbe3 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -683,7 +683,7 @@ or else nothing is done if current buffer isn't visiting a file.")
  if (NILP (file))
    file = current_buffer->file_truename;
  else
-    CHECK_STRING (file, 0);
+    CHECK_STRING (file);
  if (SAVE_MODIFF < MODIFF
      && !NILP (file))
    lock_file (file);
diff --git a/src/floatfns.c b/src/floatfns.c
index f8a3e6f369d..383e2af04bc 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -218,7 +218,7 @@ double
 extract_float (num)
     Lisp_Object num;
 {
-  CHECK_NUMBER_OR_FLOAT (num, 0);
+  CHECK_NUMBER_OR_FLOAT (num);
  if (FLOATP (num))
    return XFLOAT_DATA (num);
@@ -445,8 +445,8 @@ DEFUN ("expt", Fexpt, Sexpt, 2, 2, 0,
 {
  double f1, f2;
-  CHECK_NUMBER_OR_FLOAT (arg1, 0);
+  CHECK_NUMBER_OR_FLOAT (arg1);
-  CHECK_NUMBER_OR_FLOAT (arg2, 0);
+  CHECK_NUMBER_OR_FLOAT (arg2);
  if (INTEGERP (arg1)     /* common lisp spec */
      && INTEGERP (arg2)) /* don't promote, if both are ints */
    {                           /* this can be improved by pre-calculating */
@@ -646,7 +646,7 @@ DEFUN ("abs", Fabs, Sabs, 1, 1, 0,
  (arg)
     register Lisp_Object arg;
 {
-  CHECK_NUMBER_OR_FLOAT (arg, 0);
+  CHECK_NUMBER_OR_FLOAT (arg);
  if (FLOATP (arg))
    IN_FLOAT (arg = make_float (fabs (XFLOAT_DATA (arg))), "abs", arg);
@@ -661,7 +661,7 @@ DEFUN ("float", Ffloat, Sfloat, 1, 1, 0,
  (arg)
     register Lisp_Object arg;
 {
-  CHECK_NUMBER_OR_FLOAT (arg, 0);
+  CHECK_NUMBER_OR_FLOAT (arg);
  if (INTEGERP (arg))
    return make_float ((double) XINT (arg));
@@ -727,13 +727,13 @@ rounding_driver (arg, divisor, double_round, int_round2, name)
     EMACS_INT (*int_round2) ();
     char *name;
 {
-  CHECK_NUMBER_OR_FLOAT (arg, 0);
+  CHECK_NUMBER_OR_FLOAT (arg);
  if (! NILP (divisor))
    {
      EMACS_INT i1, i2;
-      CHECK_NUMBER_OR_FLOAT (divisor, 1);
+      CHECK_NUMBER_OR_FLOAT (divisor);
      if (FLOATP (arg) || FLOATP (divisor))
        {
diff --git a/src/fns.c b/src/fns.c
index 15415d9a1ad..74208831ee2 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -207,7 +207,7 @@ If STRING is a multibyte string, this is greater than the length of STRING. */)
     (string)
     Lisp_Object string;
 {
-  CHECK_STRING (string, 1);
+  CHECK_STRING (string);
  return make_number (STRING_BYTES (XSTRING (string)));
 }
@@ -222,8 +222,8 @@ Symbols are also allowed; their print names are used instead. */)
    XSETSTRING (s1, XSYMBOL (s1)->name);
  if (SYMBOLP (s2))
    XSETSTRING (s2, XSYMBOL (s2)->name);
-  CHECK_STRING (s1, 0);
+  CHECK_STRING (s1);
-  CHECK_STRING (s2, 1);
+  CHECK_STRING (s2);
  if (XSTRING (s1)->size != XSTRING (s2)->size
      || STRING_BYTES (XSTRING (s1)) != STRING_BYTES (XSTRING (s2))
@@ -253,18 +253,18 @@ If string STR1 is greater, the value is a positive number N;
  register int end1_char, end2_char;
  register int i1, i1_byte, i2, i2_byte;
-  CHECK_STRING (str1, 0);
+  CHECK_STRING (str1);
-  CHECK_STRING (str2, 1);
+  CHECK_STRING (str2);
  if (NILP (start1))
    start1 = make_number (0);
  if (NILP (start2))
    start2 = make_number (0);
-  CHECK_NATNUM (start1, 2);
+  CHECK_NATNUM (start1);
-  CHECK_NATNUM (start2, 3);
+  CHECK_NATNUM (start2);
  if (! NILP (end1))
-    CHECK_NATNUM (end1, 4);
+    CHECK_NATNUM (end1);
  if (! NILP (end2))
-    CHECK_NATNUM (end2, 4);
+    CHECK_NATNUM (end2);
  i1 = XINT (start1);
  i2 = XINT (start2);
@@ -349,8 +349,8 @@ Symbols are also allowed; their print names are used instead. */)
    XSETSTRING (s1, XSYMBOL (s1)->name);
  if (SYMBOLP (s2))
    XSETSTRING (s2, XSYMBOL (s2)->name);
-  CHECK_STRING (s1, 0);
+  CHECK_STRING (s1);
-  CHECK_STRING (s2, 1);
+  CHECK_STRING (s2);
  i1 = i1_byte = i2 = i2_byte = 0;
@@ -791,7 +791,7 @@ concat (nargs, args, target_type, last_special)
              XVECTOR (val)->contents[toindex++] = elt;
            else
              {
-                CHECK_NUMBER (elt, 0);
+                CHECK_NUMBER (elt);
                if (SINGLE_BYTE_CHAR_P (XINT (elt)))
                  {
                    if (some_multibyte)
@@ -1061,7 +1061,7 @@ each unibyte character to a multibyte character. */)
     (string)
     Lisp_Object string;
 {
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  return string_make_multibyte (string);
 }
@@ -1074,7 +1074,7 @@ by using just the low 8 bits. */)
     (string)
     Lisp_Object string;
 {
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  return string_make_unibyte (string);
 }
@@ -1090,7 +1090,7 @@ corresponding single byte.  */)
     (string)
     Lisp_Object string;
 {
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  if (STRING_MULTIBYTE (string))
    {
@@ -1116,7 +1116,7 @@ multibyte character of charset `eight-bit-control' or `eight-bit-graphic'.  */)
     (string)
     Lisp_Object string;
 {
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  if (! STRING_MULTIBYTE (string))
    {
@@ -1150,7 +1150,7 @@ Elements of ALIST that are not conses are also shared.  */)
 {
  register Lisp_Object tem;
-  CHECK_LIST (alist, 0);
+  CHECK_LIST (alist);
  if (NILP (alist))
    return alist;
  alist = concat (1, &alist, Lisp_Cons, 0);
@@ -1185,7 +1185,7 @@ This function allows vectors as well as strings.  */)
  if (! (STRINGP (string) || VECTORP (string)))
    wrong_type_argument (Qarrayp, string);
-  CHECK_NUMBER (from, 1);
+  CHECK_NUMBER (from);
  if (STRINGP (string))
    {
@@ -1202,7 +1202,7 @@ This function allows vectors as well as strings.  */)
    }
  else
    {
-      CHECK_NUMBER (to, 2);
+      CHECK_NUMBER (to);
      to_char = XINT (to);
      if (to_char < 0)
@@ -1285,7 +1285,7 @@ DEFUN ("nthcdr", Fnthcdr, Snthcdr, 2, 2, 0,
     register Lisp_Object list;
 {
  register int i, num;
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  num = XINT (n);
  for (i = 0; i < num && !NILP (list); i++)
    {
@@ -1311,7 +1311,7 @@ DEFUN ("elt", Felt, Selt, 2, 2, 0,
     (sequence, n)
     register Lisp_Object sequence, n;
 {
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  while (1)
    {
      if (CONSP (sequence) || NILP (sequence))
@@ -1891,7 +1891,7 @@ This is the last value stored with `(put SYMBOL PROPNAME VALUE)'.  */)
     (symbol, propname)
     Lisp_Object symbol, propname;
 {
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  return Fplist_get (XSYMBOL (symbol)->plist, propname);
 }
@@ -1937,7 +1937,7 @@ It can be retrieved with `(get SYMBOL PROPNAME)'.  */)
     (symbol, propname, value)
     Lisp_Object symbol, propname, value;
 {
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
  XSYMBOL (symbol)->plist
    = Fplist_put (XSYMBOL (symbol)->plist, propname, value);
  return value;
@@ -2098,7 +2098,7 @@ ARRAY is a vector, string, char-table, or bool-vector.  */)
  else if (STRINGP (array))
    {
      register unsigned char *p = XSTRING (array)->data;
-      CHECK_NUMBER (item, 1);
+      CHECK_NUMBER (item);
      charval = XINT (item);
      size = XSTRING (array)->size;
      if (STRING_MULTIBYTE (array))
@@ -2148,7 +2148,7 @@ DEFUN ("char-table-subtype", Fchar_table_subtype, Schar_table_subtype,
     (char_table)
     Lisp_Object char_table;
 {
-  CHECK_CHAR_TABLE (char_table, 0);
+  CHECK_CHAR_TABLE (char_table);
  return XCHAR_TABLE (char_table)->purpose;
 }
@@ -2163,7 +2163,7 @@ then the actual applicable value is inherited from the parent char-table
     (char_table)
     Lisp_Object char_table;
 {
-  CHECK_CHAR_TABLE (char_table, 0);
+  CHECK_CHAR_TABLE (char_table);
  return XCHAR_TABLE (char_table)->parent;
 }
@@ -2177,11 +2177,11 @@ PARENT must be either nil or another char-table.  */)
 {
  Lisp_Object temp;
-  CHECK_CHAR_TABLE (char_table, 0);
+  CHECK_CHAR_TABLE (char_table);
  if (!NILP (parent))
    {
-      CHECK_CHAR_TABLE (parent, 0);
+      CHECK_CHAR_TABLE (parent);
      for (temp = parent; !NILP (temp); temp = XCHAR_TABLE (temp)->parent)
        if (EQ (temp, char_table))
@@ -2199,8 +2199,8 @@ DEFUN ("char-table-extra-slot", Fchar_table_extra_slot, Schar_table_extra_slot,
     (char_table, n)
     Lisp_Object char_table, n;
 {
-  CHECK_CHAR_TABLE (char_table, 1);
+  CHECK_CHAR_TABLE (char_table);
-  CHECK_NUMBER (n, 2);
+  CHECK_NUMBER (n);
  if (XINT (n) < 0
      || XINT (n) >= CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (char_table)))
    args_out_of_range (char_table, n);
@@ -2215,8 +2215,8 @@ DEFUN ("set-char-table-extra-slot", Fset_char_table_extra_slot,
     (char_table, n, value)
     Lisp_Object char_table, n, value;
 {
-  CHECK_CHAR_TABLE (char_table, 1);
+  CHECK_CHAR_TABLE (char_table);
-  CHECK_NUMBER (n, 2);
+  CHECK_NUMBER (n);
  if (XINT (n) < 0
      || XINT (n) >= CHAR_TABLE_EXTRA_SLOTS (XCHAR_TABLE (char_table)))
    args_out_of_range (char_table, n);
@@ -2233,7 +2233,7 @@ a character set name, or a character code.  */)
     (char_table, range)
     Lisp_Object char_table, range;
 {
-  CHECK_CHAR_TABLE (char_table, 0);
+  CHECK_CHAR_TABLE (char_table);
  if (EQ (range, Qnil))
    return XCHAR_TABLE (char_table)->defalt;
@@ -2244,7 +2244,7 @@ a character set name, or a character code.  */)
      Lisp_Object charset_info;
      charset_info = Fget (range, Qcharset);
-      CHECK_VECTOR (charset_info, 0);
+      CHECK_VECTOR (charset_info);
      return Faref (char_table,
                    make_number (XINT (XVECTOR (charset_info)->contents[0])
@@ -2281,7 +2281,7 @@ a coding system, or a character code.  */)
 {
  int i;
-  CHECK_CHAR_TABLE (char_table, 0);
+  CHECK_CHAR_TABLE (char_table);
  if (EQ (range, Qt))
    for (i = 0; i < CHAR_TABLE_ORDINARY_SLOTS; i++)
@@ -2293,7 +2293,7 @@ a coding system, or a character code.  */)
      Lisp_Object charset_info;
      charset_info = Fget (range, Qcharset);
-      CHECK_VECTOR (charset_info, 0);
+      CHECK_VECTOR (charset_info);
      return Faset (char_table,
                    make_number (XINT (XVECTOR (charset_info)->contents[0])
@@ -2335,8 +2335,8 @@ See also the documentation of make-char.  */)
  int c, charset, code1, code2;
  Lisp_Object temp;
-  CHECK_CHAR_TABLE (char_table, 0);
+  CHECK_CHAR_TABLE (char_table);
-  CHECK_NUMBER (ch, 1);
+  CHECK_NUMBER (ch);
  c = XINT (ch);
  SPLIT_CHAR (c, charset, code1, code2);
@@ -2424,7 +2424,7 @@ DEFUN ("optimize-char-table", Foptimize_char_table, Soptimize_char_table,
  int dim;
  int i, j;
-  CHECK_CHAR_TABLE (table, 0);
+  CHECK_CHAR_TABLE (table);
  for (i = CHAR_TABLE_SINGLE_BYTE_SLOTS; i < CHAR_TABLE_ORDINARY_SLOTS; i++)
    {
@@ -2533,7 +2533,7 @@ The key is always a possible IDX argument to `aref'.  */)
  /* The depth of char table is at most 3. */
  Lisp_Object indices[3];
-  CHECK_CHAR_TABLE (char_table, 1);
+  CHECK_CHAR_TABLE (char_table);
  map_char_table (NULL, function, char_table, char_table, 0, indices);
  return Qnil;
@@ -2817,7 +2817,7 @@ is nil and `use-dialog-box' is non-nil.  */)
  map = Fsymbol_value (intern ("query-replace-map"));
-  CHECK_STRING (prompt, 0);
+  CHECK_STRING (prompt);
  xprompt = prompt;
  GCPRO2 (prompt, xprompt);
@@ -2947,7 +2947,7 @@ is nil, and `use-dialog-box' is non-nil.  */)
  Lisp_Object args[2];
  struct gcpro gcpro1;
-  CHECK_STRING (prompt, 0);
+  CHECK_STRING (prompt);
 #ifdef HAVE_MENUS
  if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
@@ -3043,7 +3043,7 @@ SUBFEATURE can be used to check a specific subfeature of FEATURE.  */)
     Lisp_Object feature, subfeature;
 {
  register Lisp_Object tem;
-  CHECK_SYMBOL (feature, 0);
+  CHECK_SYMBOL (feature);
  tem = Fmemq (feature, Vfeatures);
  if (!NILP (tem) && !NILP (subfeature))
    tem = Fmemq (subfeature, Fget (feature, Qsubfeatures));
@@ -3058,7 +3058,7 @@ particular subfeatures supported in this version of FEATURE.  */)
     Lisp_Object feature, subfeatures;
 {
  register Lisp_Object tem;
-  CHECK_SYMBOL (feature, 0);
+  CHECK_SYMBOL (feature);
  if (!NILP (Vautoload_queue))
    Vautoload_queue = Fcons (Fcons (Vfeatures, Qnil), Vautoload_queue);
  tem = Fmemq (feature, Vfeatures);
@@ -3106,7 +3106,7 @@ The normal messages at start and end of loading FILENAME are suppressed.  */)
  register Lisp_Object tem;
  struct gcpro gcpro1, gcpro2;
-  CHECK_SYMBOL (feature, 0);
+  CHECK_SYMBOL (feature);
  tem = Fmemq (feature, Vfeatures);
@@ -3194,7 +3194,7 @@ The value can later be retrieved with `widget-get'.  */)
     (widget, property, value)
     Lisp_Object widget, property, value;
 {
-  CHECK_CONS (widget, 1);
+  CHECK_CONS (widget);
  XSETCDR (widget, Fplist_put (XCDR (widget), property, value));
  return value;
 }
@@ -3212,7 +3212,7 @@ later with `widget-put'.  */)
    {
      if (NILP (widget))
        return Qnil;
-      CHECK_CONS (widget, 1);
+      CHECK_CONS (widget);
      tmp = Fplist_member (XCDR (widget), property);
      if (CONSP (tmp))
        {
@@ -3410,7 +3410,7 @@ into shorter lines.  */)
  char *encoded;
  Lisp_Object encoded_string;
-  CHECK_STRING (string, 1);
+  CHECK_STRING (string);
  /* We need to allocate enough room for encoding the text.
     We need 33 1/3% more space, plus a newline every 76
@@ -3616,7 +3616,7 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string,
  int length, decoded_length;
  Lisp_Object decoded_string;
-  CHECK_STRING (string, 1);
+  CHECK_STRING (string);
  length = STRING_BYTES (XSTRING (string));
  /* We need to allocate enough room for decoding the text. */
@@ -3825,7 +3825,7 @@ static struct Lisp_Hash_Table *
 check_hash_table (obj)
     Lisp_Object obj;
 {
-  CHECK_HASH_TABLE (obj, 0);
+  CHECK_HASH_TABLE (obj);
  return XHASH_TABLE (obj);
 }
@@ -5109,7 +5109,7 @@ guesswork fails.  Normally, an error is signaled in such case.  */)
      if (!NILP (start))
        {
-          CHECK_NUMBER (start, 1);
+          CHECK_NUMBER (start);
          start_char = XINT (start);
@@ -5126,7 +5126,7 @@ guesswork fails.  Normally, an error is signaled in such case.  */)
        }
      else
        {
-          CHECK_NUMBER (end, 2);
+          CHECK_NUMBER (end);
          
          end_char = XINT (end);
@@ -5142,7 +5142,7 @@ guesswork fails.  Normally, an error is signaled in such case.  */)
    }
  else
    {
-      CHECK_BUFFER (object, 0);
+      CHECK_BUFFER (object);
      bp = XBUFFER (object);
          
@@ -5150,7 +5150,7 @@ guesswork fails.  Normally, an error is signaled in such case.  */)
        b = BUF_BEGV (bp);
      else
        {
-          CHECK_NUMBER_COERCE_MARKER (start, 0);
+          CHECK_NUMBER_COERCE_MARKER (start);
          b = XINT (start);
        }
@@ -5158,7 +5158,7 @@ guesswork fails.  Normally, an error is signaled in such case.  */)
        e = BUF_ZV (bp);
      else
        {
-          CHECK_NUMBER_COERCE_MARKER (end, 1);
+          CHECK_NUMBER_COERCE_MARKER (end);
          e = XINT (end);
        }
      
diff --git a/src/fontset.c b/src/fontset.c
index 7e7364b0205..647657e389c 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -816,7 +816,7 @@ If REGEXPP is non-nil, PATTERN is a regular expression.")
  (*check_window_system_func) ();
-  CHECK_STRING (pattern, 0);
+  CHECK_STRING (pattern);
  if (XSTRING (pattern)->size == 0)
    return Qnil;
@@ -888,8 +888,8 @@ FONTLIST is an alist of charsets vs corresponding font name patterns.")
  (*check_window_system_func) ();
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
-  CHECK_LIST (fontlist, 1);
+  CHECK_LIST (fontlist);
  name = Fdowncase (name);
  tem = Fquery_fontset (name, Qnil);
@@ -969,7 +969,7 @@ check_fontset_name (name)
  if (EQ (name, Qt))
    return Vdefault_fontset;
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  id = fs_query_fontset (name, 0);
  if (id < 0)
    error ("Fontset `%s' does not exist", XSTRING (name)->data);
@@ -1002,8 +1002,8 @@ name of a font, REGSITRY is a registry name of a font.")
    {
      /* CH should be (FROM . TO) where FROM and TO are non-generic
         characters.  */
-      CHECK_NUMBER_CAR (character, 1);
+      CHECK_NUMBER_CAR (character);
-      CHECK_NUMBER_CDR (character, 1);
+      CHECK_NUMBER_CDR (character);
      from = XINT (XCAR (character));
      to = XINT (XCDR (character));
      if (!char_valid_p (from, 0) || !char_valid_p (to, 0))
@@ -1022,7 +1022,7 @@ name of a font, REGSITRY is a registry name of a font.")
    }
  else
    {
-      CHECK_NUMBER (character, 1);
+      CHECK_NUMBER (character);
      from = XINT (character);
      to = from;
    }
@@ -1045,17 +1045,17 @@ name of a font, REGSITRY is a registry name of a font.")
    }
  else
    {
-      CHECK_CONS (fontname, 2);
+      CHECK_CONS (fontname);
      family = XCAR (fontname);
      registry = XCDR (fontname);
      if (!NILP (family))
        {
-          CHECK_STRING (family, 2);
+          CHECK_STRING (family);
          family = Fdowncase (family);
        }
      if (!NILP (registry))
        {
-          CHECK_STRING (registry, 2);
+          CHECK_STRING (registry);
          registry = Fdowncase (registry);
        }
      elt = Fcons (make_number (from), Fcons (family, registry));
@@ -1064,7 +1064,7 @@ name of a font, REGSITRY is a registry name of a font.")
  /* The arg FRAME is kept for backward compatibility.  We only check
     the validity.  */
  if (!NILP (frame))
-    CHECK_LIVE_FRAME (frame, 3);
+    CHECK_LIVE_FRAME (frame);
  for (; from <= to; from++)
    FONTSET_SET (fontset, from, elt);
@@ -1113,11 +1113,11 @@ If the named font is not yet loaded, return nil.")
  (*check_window_system_func) ();
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  name = Fdowncase (name);
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 1);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  if (!query_font_func)
@@ -1170,7 +1170,7 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 1, 0,
  struct frame *f;
  struct face *face;
-  CHECK_NUMBER_COERCE_MARKER (position, 0);
+  CHECK_NUMBER_COERCE_MARKER (position);
  pos = XINT (position);
  if (pos < BEGV || pos >= ZV)
    args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));
@@ -1274,7 +1274,7 @@ If FRAME is omitted, it defaults to the currently selected frame.")
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 1);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  /* Recode realized fontsets whose base is FONTSET in the table
@@ -1360,7 +1360,7 @@ If NAME is t, find a font name pattern in the default fontset.")
  fontset = check_fontset_name (name);
-  CHECK_NUMBER (ch, 1);
+  CHECK_NUMBER (ch);
  c = XINT (ch);
  if (!char_valid_p (c, 1))
    invalid_character (c);
diff --git a/src/frame.c b/src/frame.c
index 3cd2e082ece..a32cc56e2b9 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -337,7 +337,7 @@ make_frame_without_minibuffer (mini_window, kb, display)
  struct gcpro gcpro1;
  if (!NILP (mini_window))
-    CHECK_LIVE_WINDOW (mini_window, 0);
+    CHECK_LIVE_WINDOW (mini_window);
 #ifdef MULTI_KBOARD
  if (!NILP (mini_window)
@@ -579,7 +579,7 @@ do_switch_frame (frame, track, for_deletion)
  /* This used to say CHECK_LIVE_FRAME, but apparently it's possible for
     a switch-frame event to arrive after a frame is no longer live,
     especially when deleting the initial frame during startup.  */
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
  if (! FRAME_LIVE_P (XFRAME (frame)))
    return Qnil;
@@ -703,7 +703,7 @@ DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0,
     (window)
     Lisp_Object window;
 {
-  CHECK_LIVE_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window);
  return XWINDOW (window)->frame;
 }
@@ -719,7 +719,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
    w = SELECTED_FRAME ()->root_window;
  else
    {
-      CHECK_LIVE_FRAME (frame, 0);
+      CHECK_LIVE_FRAME (frame);
      w = XFRAME (frame)->root_window;
    }
  while (NILP (XWINDOW (w)->buffer))
@@ -754,7 +754,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
    window = SELECTED_FRAME ()->root_window;
  else
    {
-      CHECK_LIVE_FRAME (frame, 0);
+      CHECK_LIVE_FRAME (frame);
      window = XFRAME (frame)->root_window;
    }
  
@@ -774,7 +774,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
    window = SELECTED_FRAME ()->selected_window;
  else
    {
-      CHECK_LIVE_FRAME (frame, 0);
+      CHECK_LIVE_FRAME (frame);
      window = XFRAME (frame)->selected_window;
    }
@@ -792,8 +792,8 @@ If FRAME is the selected frame, this makes WINDOW the selected window.  */)
  if (NILP (frame))
    frame = selected_frame;
  
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
-  CHECK_LIVE_WINDOW (window, 1);
+  CHECK_LIVE_WINDOW (window);
  if (! EQ (frame, WINDOW_FRAME (XWINDOW (window))))
    error ("In `set-frame-selected-window', WINDOW is not on FRAME");
@@ -840,7 +840,7 @@ next_frame (frame, minibuf)
  /* If this frame is dead, it won't be in Vframe_list, and we'll loop
     forever.  Forestall that.  */
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  while (1)
    for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
@@ -992,7 +992,7 @@ Otherwise, include all frames.  */)
  if (NILP (frame))
    frame = selected_frame;
  
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  return next_frame (frame, miniframe);
 }
@@ -1012,7 +1012,7 @@ Otherwise, include all frames.  */)
 {
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  return prev_frame (frame, miniframe);
 }
@@ -1084,7 +1084,7 @@ frame.  The hook is called with one argument FRAME.  */)
    }
  else
    {
-      CHECK_FRAME (frame, 0);
+      CHECK_FRAME (frame);
      f = XFRAME (frame);
    }
@@ -1404,9 +1404,9 @@ before calling this function on it, like this.
  (frame, x, y)
     Lisp_Object frame, x, y;
 {
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
-  CHECK_NUMBER (x, 2);
+  CHECK_NUMBER (x);
-  CHECK_NUMBER (y, 1);
+  CHECK_NUMBER (y);
  /* I think this should be done with a hook.  */
 #ifdef HAVE_WINDOW_SYSTEM
@@ -1436,9 +1436,9 @@ before calling this function on it, like this.
  (frame, x, y)
     Lisp_Object frame, x, y;
 {
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
-  CHECK_NUMBER (x, 2);
+  CHECK_NUMBER (x);
-  CHECK_NUMBER (y, 1);
+  CHECK_NUMBER (y);
  /* I think this should be done with a hook.  */
 #ifdef HAVE_WINDOW_SYSTEM
@@ -1470,7 +1470,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  /* I think this should be done with a hook.  */
 #ifdef HAVE_WINDOW_SYSTEM
@@ -1524,7 +1524,7 @@ but if the second optional argument FORCE is non-nil, you may do so.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  if (NILP (force) && !other_visible_frames (XFRAME (frame)))
    error ("Attempt to make invisible the sole visible or iconified frame");
@@ -1566,7 +1566,7 @@ If omitted, FRAME defaults to the currently selected frame.  */)
  if (NILP (frame))
    frame = selected_frame;
  
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
 #if 0 /* This isn't logically necessary, and it can do GC.  */
  /* Don't let the frame remain selected.  */
@@ -1604,7 +1604,7 @@ Return the symbol `icon' if frame is visible only as an icon.  */)
     (frame)
     Lisp_Object frame;
 {
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  FRAME_SAMPLE_VISIBILITY (XFRAME (frame));
@@ -1650,7 +1650,7 @@ doesn't support multiple overlapping frames, this function does nothing.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  /* Do like the documentation says. */
  Fmake_frame_visible (frame);
@@ -1673,7 +1673,7 @@ doesn't support multiple overlapping frames, this function does nothing.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  
  if (frame_raise_lower_hook)
    (*frame_raise_lower_hook) (XFRAME (frame), 0);
@@ -1713,10 +1713,10 @@ The redirection lasts until `redirect-frame-focus' is called to change it.  */)
  /* Note that we don't check for a live frame here.  It's reasonable
     to redirect the focus of a frame you're about to delete, if you
     know what other frame should receive those keystrokes.  */
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
  if (! NILP (focus_frame))
-    CHECK_LIVE_FRAME (focus_frame, 1);
+    CHECK_LIVE_FRAME (focus_frame);
  XFRAME (frame)->focus_frame = focus_frame;
@@ -1734,7 +1734,7 @@ See `redirect-frame-focus'.  */)
     (frame)
     Lisp_Object frame;
 {
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  return FRAME_FOCUS_FRAME (XFRAME (frame));
 }
@@ -1879,7 +1879,7 @@ set_term_frame_name (f, name)
    }
  else
    {
-      CHECK_STRING (name, 0);
+      CHECK_STRING (name);
      /* Don't change the name if it's already NAME.  */
      if (! NILP (Fstring_equal (name, f->name)))
@@ -1976,7 +1976,7 @@ If FRAME is omitted, return information on the currently selected frame.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
  f = XFRAME (frame);
  if (!FRAME_LIVE_P (f))
@@ -2071,8 +2071,8 @@ If FRAME is nil, describe the currently selected frame.  */)
  if (NILP (frame))
    frame = selected_frame;
  else
-    CHECK_FRAME (frame, 0);
+    CHECK_FRAME (frame);
-  CHECK_SYMBOL (parameter, 1);
+  CHECK_SYMBOL (parameter);
  
  f = XFRAME (frame);
  value = Qnil;
@@ -2166,7 +2166,7 @@ enabled such bindings for that variable with `make-variable-frame-local'.  */)
  if (EQ (frame, Qnil))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  /* I think this should be done with a hook.  */
@@ -2226,7 +2226,7 @@ For a terminal frame, the value is always 1.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
  f = XFRAME (frame);
 #ifdef HAVE_WINDOW_SYSTEM
@@ -2252,7 +2252,7 @@ For a terminal screen, the value is always 1.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
  f = XFRAME (frame);
 #ifdef HAVE_WINDOW_SYSTEM
@@ -2277,7 +2277,7 @@ If FRAME is omitted, the selected frame is used.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
  f = XFRAME (frame);
 #ifdef HAVE_WINDOW_SYSTEM
@@ -2300,7 +2300,7 @@ If FRAME is omitted, the selected frame is used.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
  f = XFRAME (frame);
 #ifdef HAVE_WINDOW_SYSTEM
@@ -2320,10 +2320,10 @@ but that the idea of the actual height of the frame should not be changed.  */)
 {
  register struct frame *f;
-  CHECK_NUMBER (lines, 0);
+  CHECK_NUMBER (lines);
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  /* I think this should be done with a hook.  */
@@ -2348,10 +2348,10 @@ but that the idea of the actual width of the frame should not be changed.  */)
     Lisp_Object frame, cols, pretend;
 {
  register struct frame *f;
-  CHECK_NUMBER (cols, 0);
+  CHECK_NUMBER (cols);
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  /* I think this should be done with a hook.  */
@@ -2375,9 +2375,9 @@ DEFUN ("set-frame-size", Fset_frame_size, Sset_frame_size, 3, 3, 0,
 {
  register struct frame *f;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
-  CHECK_NUMBER (cols, 2);
+  CHECK_NUMBER (cols);
-  CHECK_NUMBER (rows, 1);
+  CHECK_NUMBER (rows);
  f = XFRAME (frame);
  /* I think this should be done with a hook.  */
@@ -2407,9 +2407,9 @@ the rightmost or bottommost possible position (that stays within the screen).  *
 {
  register struct frame *f;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
-  CHECK_NUMBER (xoffset, 1);
+  CHECK_NUMBER (xoffset);
-  CHECK_NUMBER (yoffset, 2);
+  CHECK_NUMBER (yoffset);
  f = XFRAME (frame);
  /* I think this should be done with a hook.  */
diff --git a/src/indent.c b/src/indent.c
index 1d9e1a5faed..c0220c34b89 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -655,7 +655,7 @@ string_display_width (string, beg, end)
    e = XSTRING (string)->size;
  else
    {
-      CHECK_NUMBER (end, 0);
+      CHECK_NUMBER (end);
      e = XINT (end);
    }
@@ -663,7 +663,7 @@ string_display_width (string, beg, end)
    b = 0;
  else
    {
-      CHECK_NUMBER (beg, 0);
+      CHECK_NUMBER (beg);
      b = XINT (beg);
    }
@@ -725,10 +725,10 @@ even if that goes past COLUMN; by default, MININUM is zero.  */)
  register int fromcol;
  register int tab_width = XINT (current_buffer->tab_width);
-  CHECK_NUMBER (column, 0);
+  CHECK_NUMBER (column);
  if (NILP (minimum))
    XSETFASTINT (minimum, 0);
-  CHECK_NUMBER (minimum, 1);
+  CHECK_NUMBER (minimum);
  fromcol = current_column ();
  mincol = fromcol + XINT (minimum);
@@ -925,7 +925,7 @@ The return value is the current column.  */)
  int pos_byte, end_byte, next_boundary_byte;
  if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
-  CHECK_NATNUM (column, 0);
+  CHECK_NATNUM (column);
  goal = XINT (column);
  pos = PT;
@@ -1747,20 +1747,20 @@ visible section of the buffer, and pass LINE and COL as TOPOS.  */)
  struct position *pos;
  int hscroll, tab_offset;
-  CHECK_NUMBER_COERCE_MARKER (from, 0);
+  CHECK_NUMBER_COERCE_MARKER (from);
-  CHECK_CONS (frompos, 0);
+  CHECK_CONS (frompos);
-  CHECK_NUMBER_CAR (frompos, 0);
+  CHECK_NUMBER_CAR (frompos);
-  CHECK_NUMBER_CDR (frompos, 0);
+  CHECK_NUMBER_CDR (frompos);
-  CHECK_NUMBER_COERCE_MARKER (to, 0);
+  CHECK_NUMBER_COERCE_MARKER (to);
-  CHECK_CONS (topos, 0);
+  CHECK_CONS (topos);
-  CHECK_NUMBER_CAR (topos, 0);
+  CHECK_NUMBER_CAR (topos);
-  CHECK_NUMBER_CDR (topos, 0);
+  CHECK_NUMBER_CDR (topos);
-  CHECK_NUMBER (width, 0);
+  CHECK_NUMBER (width);
  if (!NILP (offsets))
    {
-      CHECK_CONS (offsets, 0);
+      CHECK_CONS (offsets);
-      CHECK_NUMBER_CAR (offsets, 0);
+      CHECK_NUMBER_CAR (offsets);
-      CHECK_NUMBER_CDR (offsets, 0);
+      CHECK_NUMBER_CDR (offsets);
      hscroll = XINT (XCAR (offsets));
      tab_offset = XINT (XCDR (offsets));
    }
@@ -1770,7 +1770,7 @@ visible section of the buffer, and pass LINE and COL as TOPOS.  */)
  if (NILP (window))
    window = Fselected_window ();
  else
-    CHECK_LIVE_WINDOW (window, 0);
+    CHECK_LIVE_WINDOW (window);
  if (XINT (from) < BEGV || XINT (from) > ZV)
    args_out_of_range_3 (from, make_number (BEGV), make_number (ZV));
@@ -1976,9 +1976,9 @@ whether or not it is currently displayed in some window.  */)
  Lisp_Object old_buffer;
  struct gcpro gcpro1;
-  CHECK_NUMBER (lines, 0);
+  CHECK_NUMBER (lines);
  if (! NILP (window))
-    CHECK_WINDOW (window, 0);
+    CHECK_WINDOW (window);
  else
    window = selected_window;
  w = XWINDOW (window);
diff --git a/src/keyboard.c b/src/keyboard.c
index bbdc148157f..623dd1516dd 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5444,7 +5444,7 @@ parse_modifiers_uncached (symbol, modifier_end)
  int i;
  int modifiers;
-  CHECK_SYMBOL (symbol, 1);
+  CHECK_SYMBOL (symbol);
  modifiers = 0;
  name = XSYMBOL (symbol)->name;
@@ -9035,7 +9035,7 @@ will read just one key sequence.  */)
  int count = specpdl_ptr - specpdl;
  if (!NILP (prompt))
-    CHECK_STRING (prompt, 0);
+    CHECK_STRING (prompt);
  QUIT;
  specbind (Qinput_method_exit_on_first_char,
@@ -9094,7 +9094,7 @@ DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
  int count = specpdl_ptr - specpdl;
  if (!NILP (prompt))
-    CHECK_STRING (prompt, 0);
+    CHECK_STRING (prompt);
  QUIT;
  specbind (Qinput_method_exit_on_first_char,
@@ -9677,7 +9677,7 @@ On such systems, Emacs starts a subshell instead of suspending.  */)
  struct gcpro gcpro1;
  if (!NILP (stuffstring))
-    CHECK_STRING (stuffstring, 0);
+    CHECK_STRING (stuffstring);
  /* Run the functions in suspend-hook.  */
  if (!NILP (Vrun_hooks))
diff --git a/src/keymap.c b/src/keymap.c
index 802c1413c75..018e1ea1eb9 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1958,7 +1958,7 @@ around function keys and event symbols.")
          /* Handle a generic character.  */
          Lisp_Object name;
          name = CHARSET_TABLE_INFO (charset, CHARSET_LONG_NAME_IDX);
-          CHECK_STRING (name, 0);
+          CHECK_STRING (name);
          return concat2 (build_string ("Character set "), name);
        }
      else
@@ -2037,7 +2037,7 @@ Control characters turn into \"^char\", etc.")
  unsigned char str[6];
  int c;
-  CHECK_NUMBER (character, 0);
+  CHECK_NUMBER (character);
  c = XINT (character);
  if (!SINGLE_BYTE_CHAR_P (c))
@@ -2941,7 +2941,7 @@ This is text showing the elements of vector matched against indices.")
  int count = specpdl_ptr - specpdl;
  specbind (Qstandard_output, Fcurrent_buffer ());
-  CHECK_VECTOR_OR_CHAR_TABLE (vector, 0);
+  CHECK_VECTOR_OR_CHAR_TABLE (vector);
  describe_vector (vector, Qnil, describe_vector_princ, 0,
                   Qnil, Qnil, (int *)0, 0);
@@ -3306,7 +3306,7 @@ Return list of symbols found.")
     Lisp_Object regexp, predicate;
 {
  struct gcpro gcpro1, gcpro2;
-  CHECK_STRING (regexp, 0);
+  CHECK_STRING (regexp);
  apropos_predicate = predicate;
  GCPRO2 (apropos_predicate, apropos_accumulate);
  apropos_accumulate = Qnil;
diff --git a/src/lread.c b/src/lread.c
index be0ecb64445..9d35ce074c9 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -644,7 +644,7 @@ Return t if file exists.")
  fmode = "rt";
 #endif /* DOS_NT */
-  CHECK_STRING (file, 0);
+  CHECK_STRING (file);
  /* If file name is magic, call the handler.  */
  /* This shouldn't be necessary any more now that `openp' handles it right.
@@ -966,7 +966,7 @@ openp (path, str, suffixes, storeptr, exec_only)
  for (tail = suffixes; CONSP (tail); tail = XCDR (tail))
    {
-      CHECK_STRING (XCAR (tail), 0);
+      CHECK_STRING (XCAR (tail));
      max_suffix_len = max (max_suffix_len,
                            STRING_BYTES (XSTRING (XCAR (tail))));
    }
@@ -1450,13 +1450,13 @@ START and END optionally delimit a substring of STRING from which to read;\n\
  int startval, endval;
  Lisp_Object tem;
-  CHECK_STRING (string,0);
+  CHECK_STRING (string);
  if (NILP (end))
    endval = XSTRING (string)->size;
  else
    {
-      CHECK_NUMBER (end, 2);
+      CHECK_NUMBER (end);
      endval = XINT (end);
      if (endval < 0 || endval > XSTRING (string)->size)
        args_out_of_range (string, end);
@@ -1466,7 +1466,7 @@ START and END optionally delimit a substring of STRING from which to read;\n\
    startval = 0;
  else
    {
-      CHECK_NUMBER (start, 1);
+      CHECK_NUMBER (start);
      startval = XINT (start);
      if (startval < 0 || startval > endval)
        args_out_of_range (string, start);
@@ -2938,7 +2938,7 @@ it defaults to the value of `obarray'.")
  if (NILP (obarray)) obarray = Vobarray;
  obarray = check_obarray (obarray);
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  tem = oblookup (obarray, XSTRING (string)->data,
                  XSTRING (string)->size,
@@ -2988,7 +2988,7 @@ it defaults to the value of `obarray'.")
  if (!SYMBOLP (name))
    {
-      CHECK_STRING (name, 0);
+      CHECK_STRING (name);
      string = XSTRING (name);
    }
  else
@@ -3020,7 +3020,7 @@ OBARRAY defaults to the value of the variable `obarray'.")
    XSETSTRING (string, XSYMBOL (name)->name);
  else
    {
-      CHECK_STRING (name, 0);
+      CHECK_STRING (name);
      string = name;
    }
@@ -3141,7 +3141,7 @@ map_obarray (obarray, fn, arg)
 {
  register int i;
  register Lisp_Object tail;
-  CHECK_VECTOR (obarray, 1);
+  CHECK_VECTOR (obarray);
  for (i = XVECTOR (obarray)->size - 1; i >= 0; i--)
    {
      tail = XVECTOR (obarray)->contents[i];
diff --git a/src/macros.c b/src/macros.c
index af066574c66..4bacf789780 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -147,7 +147,7 @@ An argument of zero means repeat until error.")
  if (NILP (repeat))
    XSETFASTINT (repeat, 1);
  else
-    CHECK_NUMBER (repeat, 0);
+    CHECK_NUMBER (repeat);
  if (!NILP (current_kboard->defining_kbd_macro))
    {
diff --git a/src/marker.c b/src/marker.c
index 2ba164d2dc4..b634d644790 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -434,7 +434,7 @@ Returns nil if MARKER points into a dead buffer.  */)
     register Lisp_Object marker;
 {
  register Lisp_Object buf;
-  CHECK_MARKER (marker, 0);
+  CHECK_MARKER (marker);
  if (XMARKER (marker)->buffer)
    {
      XSETBUFFER (buf, XMARKER (marker)->buffer);
@@ -450,7 +450,7 @@ DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0,
     (marker)
     Lisp_Object marker;
 {
-  CHECK_MARKER (marker, 0);
+  CHECK_MARKER (marker);
  if (XMARKER (marker)->buffer)
    return make_number (XMARKER (marker)->charpos);
@@ -470,7 +470,7 @@ Returns MARKER.  */)
  register struct buffer *b;
  register struct Lisp_Marker *m;
-  CHECK_MARKER (marker, 0);
+  CHECK_MARKER (marker);
  /* If position is nil or a marker that points nowhere,
     make this marker point nowhere.  */
  if (NILP (position)
@@ -484,7 +484,7 @@ Returns MARKER.  */)
    b = current_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 1);
+      CHECK_BUFFER (buffer);
      b = XBUFFER (buffer);
      /* If buffer is dead, set marker to point nowhere.  */
      if (EQ (b->name, Qnil))
@@ -506,7 +506,7 @@ Returns MARKER.  */)
      return marker;
    }
-  CHECK_NUMBER_COERCE_MARKER (position, 1);
+  CHECK_NUMBER_COERCE_MARKER (position);
  charno = XINT (position);
@@ -546,7 +546,7 @@ set_marker_restricted (marker, pos, buffer)
  register struct buffer *b;
  register struct Lisp_Marker *m;
-  CHECK_MARKER (marker, 0);
+  CHECK_MARKER (marker);
  /* If position is nil or a marker that points nowhere,
     make this marker point nowhere.  */
  if (NILP (pos)
@@ -560,7 +560,7 @@ set_marker_restricted (marker, pos, buffer)
    b = current_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 1);
+      CHECK_BUFFER (buffer);
      b = XBUFFER (buffer);
      /* If buffer is dead, set marker to point nowhere.  */
      if (EQ (b->name, Qnil))
@@ -582,7 +582,7 @@ set_marker_restricted (marker, pos, buffer)
      return marker;
    }
-  CHECK_NUMBER_COERCE_MARKER (pos, 1);
+  CHECK_NUMBER_COERCE_MARKER (pos);
  charno = XINT (pos);
@@ -622,13 +622,13 @@ set_marker_both (marker, buffer, charpos, bytepos)
  register struct buffer *b;
  register struct Lisp_Marker *m;
-  CHECK_MARKER (marker, 0);
+  CHECK_MARKER (marker);
  if (NILP (buffer))
    b = current_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 1);
+      CHECK_BUFFER (buffer);
      b = XBUFFER (buffer);
      /* If buffer is dead, set marker to point nowhere.  */
      if (EQ (b->name, Qnil))
@@ -673,13 +673,13 @@ set_marker_restricted_both (marker, buffer, charpos, bytepos)
  register struct buffer *b;
  register struct Lisp_Marker *m;
-  CHECK_MARKER (marker, 0);
+  CHECK_MARKER (marker);
  if (NILP (buffer))
    b = current_buffer;
  else
    {
-      CHECK_BUFFER (buffer, 1);
+      CHECK_BUFFER (buffer);
      b = XBUFFER (buffer);
      /* If buffer is dead, set marker to point nowhere.  */
      if (EQ (b->name, Qnil))
@@ -843,7 +843,7 @@ nil means the marker stays before text inserted there.  */)
     (marker)
     register Lisp_Object marker;
 {
-  CHECK_MARKER (marker, 0);
+  CHECK_MARKER (marker);
  return XMARKER (marker)->insertion_type ? Qt : Qnil;
 }
@@ -855,7 +855,7 @@ If TYPE is nil, it means the marker stays behind when you insert text at it.  */
     (marker, type)
     Lisp_Object marker, type;
 {
-  CHECK_MARKER (marker, 0);
+  CHECK_MARKER (marker);
  XMARKER (marker)->insertion_type = ! NILP (type);
  return type;
diff --git a/src/minibuf.c b/src/minibuf.c
index f0b8436ba0e..da5748d943a 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -199,7 +199,7 @@ without invoking the usual minibuffer commands.  */)
     (window)
     Lisp_Object window;
 {
-  CHECK_WINDOW (window, 1);
+  CHECK_WINDOW (window);
  if (! MINI_WINDOW_P (XWINDOW (window)))
    error ("Window is not a minibuffer window");
@@ -848,7 +848,7 @@ If the variable `minibuffer-allow-text-properties' is non-nil,
  position = Qnil;
-  CHECK_STRING (prompt, 0);
+  CHECK_STRING (prompt);
  if (!NILP (initial_contents))
    {
      if (CONSP (initial_contents))
@@ -856,10 +856,10 @@ If the variable `minibuffer-allow-text-properties' is non-nil,
          position = Fcdr (initial_contents);
          initial_contents = Fcar (initial_contents);
        }
-      CHECK_STRING (initial_contents, 1);
+      CHECK_STRING (initial_contents);
      if (!NILP (position))
        {
-          CHECK_NUMBER (position, 0);
+          CHECK_NUMBER (position);
          /* Convert to distance from end of input.  */
          if (XINT (position) < 1)
            /* A number too small means the beginning of the string.  */
@@ -906,9 +906,9 @@ is a string to insert in the minibuffer before reading.  */)
     (prompt, initial_contents)
     Lisp_Object prompt, initial_contents;
 {
-  CHECK_STRING (prompt, 0);
+  CHECK_STRING (prompt);
  if (!NILP (initial_contents))
-    CHECK_STRING (initial_contents, 1);
+    CHECK_STRING (initial_contents);
  return read_minibuf (Vminibuffer_local_map, initial_contents,
                       prompt, Qnil, 1, Qminibuffer_history,
                       make_number (0), Qnil, 0, 0);
@@ -958,9 +958,9 @@ the current input method and the setting of enable-multibyte-characters.  */)
     (prompt, initial, inherit_input_method)
     Lisp_Object prompt, initial, inherit_input_method;
 {
-  CHECK_STRING (prompt, 0);
+  CHECK_STRING (prompt);
  if (! NILP (initial))
-    CHECK_STRING (initial, 1);
+    CHECK_STRING (initial);
  return read_minibuf (Vminibuffer_local_ns_map, initial, prompt, Qnil,
                       0, Qminibuffer_history, make_number (0), Qnil, 0,
@@ -1111,7 +1111,7 @@ is used to further constrain the set of candidates.  */)
  Lisp_Object bucket, zero, end, tem;
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  if (!list && !VECTORP (alist))
    return call3 (alist, string, predicate, Qnil);
@@ -1359,7 +1359,7 @@ are ignored unless STRING itself starts with a space.  */)
  Lisp_Object bucket, tem;
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  if (!list && !VECTORP (alist))
    {
      return call3 (alist, string, predicate, Qt);
@@ -1532,10 +1532,10 @@ Completion ignores case if the ambient value of
          position = Fcdr (init);
          init = Fcar (init);
        }
-      CHECK_STRING (init, 0);
+      CHECK_STRING (init);
      if (!NILP (position))
        {
-          CHECK_NUMBER (position, 0);
+          CHECK_NUMBER (position);
          /* Convert to distance from end of input.  */
          pos = XINT (position) - XSTRING (init)->size;
        }
@@ -1911,7 +1911,7 @@ Return nil if there is no valid completion, else t.  */)
  {
    int buffer_nchars, completion_nchars;
-    CHECK_STRING (completion, 0);
+    CHECK_STRING (completion);
    tem = Fminibuffer_contents ();
    GCPRO2 (completion, tem);
    /* If reading a file name,
@@ -2085,16 +2085,16 @@ It can find the completion buffer in `standard-output'.  */)
          if (CONSP (elt))
            {
              tem = XCAR (elt);
-              CHECK_STRING (tem, 0);
+              CHECK_STRING (tem);
              length = XSTRING (tem)->size;
              tem = Fcar (XCDR (elt));
-              CHECK_STRING (tem, 0);
+              CHECK_STRING (tem);
              length += XSTRING (tem)->size;
            }
          else
            {
-              CHECK_STRING (elt, 0);
+              CHECK_STRING (elt);
              length = XSTRING (elt)->size;
            }
diff --git a/src/mocklisp.c b/src/mocklisp.c
index 1e4b6e2fa83..55ccce546c1 100644
--- a/src/mocklisp.c
+++ b/src/mocklisp.c
@@ -125,7 +125,7 @@ DEFUN ("ml-arg", Fml_arg, Sml_arg, 1, 2, 0,
 {
  if (EQ (Vmocklisp_arguments, Qinteractive))
    return Fread_string (prompt, Qnil, Qnil, Qnil, Qnil);
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  XSETINT (n, XINT (n) - 1);    /* Mocklisp likes to be origin-1 */
  return Fcar (Fnthcdr (n, Vmocklisp_arguments));
 }
@@ -189,9 +189,9 @@ If either FROM or LENGTH is negative, the length of STRING is added to it.  */)
     (string, from, to)
     Lisp_Object string, from, to;
 {
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
-  CHECK_NUMBER (from, 1);
+  CHECK_NUMBER (from);
-  CHECK_NUMBER (to, 2);
+  CHECK_NUMBER (to);
  if (XINT (from) < 0)
    XSETINT (from, XINT (from) + XSTRING (string)->size);
diff --git a/src/msdos.c b/src/msdos.c
index ec7c7161c2b..12235af8301 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -198,7 +198,7 @@ them.  This happens with wheeled mice on Windows 9X, for example.")
 {
  int n;
-  CHECK_NUMBER (nbuttons, 0);
+  CHECK_NUMBER (nbuttons);
  n = XINT (nbuttons);
  if (n < 2 || n > 3)
    Fsignal (Qargs_out_of_range,
@@ -2286,7 +2286,7 @@ DEFUN ("msdos-remember-default-colors", Fmsdos_remember_default_colors,
 {
  struct frame *f;
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
  f= XFRAME (frame);
  /* This function is called after applying default-frame-alist to the
@@ -2355,7 +2355,7 @@ IT_set_frame_parameters (f, alist)
      elt = Fcar (tail);
      parms[i] = Fcar (elt);
-      CHECK_SYMBOL (parms[i], 1);
+      CHECK_SYMBOL (parms[i]);
      values[i] = Fcdr (elt);
      i++;
    }
diff --git a/src/print.c b/src/print.c
index 832e9af46bd..f1f1af787eb 100644
--- a/src/print.c
+++ b/src/print.c
@@ -532,7 +532,7 @@ PRINTCHARFUN defaults to the value of `standard-output' (which see).  */)
  if (NILP (printcharfun))
    printcharfun = Vstandard_output;
-  CHECK_NUMBER (character, 0);
+  CHECK_NUMBER (character);
  PRINTPREPARE;
  PRINTCHAR (XINT (character));
  PRINTFINISH;
@@ -663,7 +663,7 @@ usage: (with-output-to-temp-buffer BUFFNAME BODY ...)  */)
  GCPRO1(args);
  name = Feval (Fcar (args));
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  temp_output_buffer_setup (XSTRING (name)->data);
  buf = Vstandard_output;
  UNGCPRO;
@@ -875,7 +875,7 @@ to make it write to the debugging output.  */)
     (character)
     Lisp_Object character;
 {
-  CHECK_NUMBER (character, 0);
+  CHECK_NUMBER (character);
  putc (XINT (character), stderr);
 #ifdef WINDOWSNT
diff --git a/src/process.c b/src/process.c
index ed0db6072fb..3d0a84d4c7b 100644
--- a/src/process.c
+++ b/src/process.c
@@ -493,7 +493,7 @@ DEFUN ("get-process", Fget_process, Sget_process, 1, 1, 0,
 {
  if (PROCESSP (name))
    return name;
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  return Fcdr (Fassoc (name, Vprocess_alist));
 }
@@ -551,7 +551,7 @@ get_process (name)
    }
  else
    {
-      CHECK_PROCESS (obj, 0);
+      CHECK_PROCESS (obj);
      proc = obj;
    }
  return proc;
@@ -634,7 +634,7 @@ If PROCESS has not yet exited or died, return 0.  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  if (!NILP (XPROCESS (process)->raw_status_low))
    update_status (XPROCESS (process));
  if (CONSP (XPROCESS (process)->status))
@@ -649,7 +649,7 @@ For a network connection, this value is nil.  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->pid;
 }
@@ -660,7 +660,7 @@ possibly modified to make it unique among process names.  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->name;
 }
@@ -672,7 +672,7 @@ For a non-child channel, this is nil.  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->command;
 }
@@ -683,7 +683,7 @@ not the name of the pty that Emacs uses to talk with that terminal.  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->tty_name;
 }
@@ -693,9 +693,9 @@ DEFUN ("set-process-buffer", Fset_process_buffer, Sset_process_buffer,
     (process, buffer)
     register Lisp_Object process, buffer;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  if (!NILP (buffer))
-    CHECK_BUFFER (buffer, 1);
+    CHECK_BUFFER (buffer);
  XPROCESS (process)->buffer = buffer;
  return buffer;
 }
@@ -707,7 +707,7 @@ Output from PROCESS is inserted in this buffer unless PROCESS has a filter.  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->buffer;
 }
@@ -717,7 +717,7 @@ DEFUN ("process-mark", Fprocess_mark, Sprocess_mark,
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->mark;
 }
@@ -734,7 +734,7 @@ If the process has a filter, its buffer is not used for output.  */)
 {
  struct Lisp_Process *p;
  
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  p = XPROCESS (process);
  /* Don't signal an error if the process' input file descriptor
@@ -770,7 +770,7 @@ See `set-process-filter' for more info on filter functions.  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->filter;
 }
@@ -782,7 +782,7 @@ It gets two arguments: the process, and a string describing the change.  */)
     (process, sentinel)
     register Lisp_Object process, sentinel;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  XPROCESS (process)->sentinel = sentinel;
  return sentinel;
 }
@@ -794,7 +794,7 @@ See `set-process-sentinel' for more info on sentinels.  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->sentinel;
 }
@@ -804,9 +804,9 @@ DEFUN ("set-process-window-size", Fset_process_window_size,
     (process, height, width)
     register Lisp_Object process, height, width;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
-  CHECK_NATNUM (height, 0);
+  CHECK_NATNUM (height);
-  CHECK_NATNUM (width, 0);
+  CHECK_NATNUM (width);
  
  if (XINT (XPROCESS (process)->infd) < 0
      || set_window_size (XINT (XPROCESS (process)->infd),
@@ -836,7 +836,7 @@ for the process which will run.  */)
     (process, flag)
     register Lisp_Object process, flag;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  XPROCESS (process)->inherit_coding_system_flag = flag;
  return flag;
 }
@@ -851,7 +851,7 @@ the process output.  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->inherit_coding_system_flag;
 }
@@ -865,7 +865,7 @@ Value is t if a query was formerly required.  */)
 {
  Lisp_Object tem;
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  tem = XPROCESS (process)->kill_without_query;
  XPROCESS (process)->kill_without_query = Fnull (value);
@@ -879,7 +879,7 @@ For a net connection, the value is a cons cell of the form (HOST SERVICE).  */)
     (process)
     register Lisp_Object process;
 {
-  CHECK_PROCESS (process, 0);
+  CHECK_PROCESS (process);
  return XPROCESS (process)->childp;
 }
@@ -1090,11 +1090,11 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
  }
  name = args[0];
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  program = args[2];
-  CHECK_STRING (program, 2);
+  CHECK_STRING (program);
  proc = make_process (name);
  /* If an error occurs and we can't start the process, we want to
@@ -1169,7 +1169,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
  for (i = 3; i < nargs; i++)
    {
      tem = args[i];
-      CHECK_STRING (tem, i);
+      CHECK_STRING (tem);
      len += STRING_BYTES (XSTRING (tem)) + 1;  /* count the blank */
    }
  new_argv = (unsigned char *) alloca (len);
@@ -1177,7 +1177,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
  for (i = 3; i < nargs; i++)
    {
      tem = args[i];
-      CHECK_STRING (tem, i);
+      CHECK_STRING (tem);
      strcat (new_argv, " ");
      strcat (new_argv, XSTRING (tem)->data);
    }
@@ -1220,7 +1220,7 @@ usage: (start-process NAME BUFFER PROGRAM &rest PROGRAM-ARGS)  */)
  for (i = 3; i < nargs; i++)
    {
      tem = args[i];
-      CHECK_STRING (tem, i);
+      CHECK_STRING (tem);
      if (STRING_MULTIBYTE (tem))
        tem = (code_convert_string_norecord
               (tem, XPROCESS (proc)->encode_coding_system, 1));
@@ -1784,8 +1784,8 @@ specifying a port number to connect to.  */)
 #endif
  GCPRO4 (name, buffer, host, service);
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
-  CHECK_STRING (host, 0);
+  CHECK_STRING (host);
 #ifdef HAVE_GETADDRINFO
  /* SERVICE can either be a string or int.
@@ -1797,7 +1797,7 @@ specifying a port number to connect to.  */)
    }
  else
    {
-      CHECK_STRING (service, 0);
+      CHECK_STRING (service);
      portstring = XSTRING (service)->data;
    }
 #else /* HAVE_GETADDRINFO */
@@ -1805,7 +1805,7 @@ specifying a port number to connect to.  */)
    port = htons ((unsigned short) XINT (service));
  else
    {
-      CHECK_STRING (service, 0);
+      CHECK_STRING (service);
      svc_info = getservbyname (XSTRING (service)->data, "tcp");
      if (svc_info == 0)
        error ("Unknown service \"%s\"", XSTRING (service)->data);
@@ -2250,11 +2250,11 @@ Return non-nil iff we received any output before the timeout expired.  */)
  int useconds;
  if (! NILP (process))
-    CHECK_PROCESS (process, 0);
+    CHECK_PROCESS (process);
  if (! NILP (timeout_msecs))
    {
-      CHECK_NUMBER (timeout_msecs, 2);
+      CHECK_NUMBER (timeout_msecs);
      useconds = XINT (timeout_msecs);
      if (!INTEGERP (timeout))
        XSETINT (timeout, 0);
@@ -2280,7 +2280,7 @@ Return non-nil iff we received any output before the timeout expired.  */)
  if (! NILP (timeout))
    {
-      CHECK_NUMBER (timeout, 1);
+      CHECK_NUMBER (timeout);
      seconds = XINT (timeout);
      if (seconds < 0 || (seconds == 0 && useconds == 0))
        seconds = -1;
@@ -3561,7 +3561,7 @@ Output from processes can arrive in between bunches.  */)
     Lisp_Object process, string;
 {
  Lisp_Object proc;
-  CHECK_STRING (string, 1);
+  CHECK_STRING (string);
  proc = get_process (process);
  send_process (proc, XSTRING (string)->data,
                STRING_BYTES (XSTRING (string)), string);
@@ -3904,7 +3904,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name.  */)
     (pid, sigcode)
     Lisp_Object pid, sigcode;
 {
-  CHECK_NUMBER (pid, 0);
+  CHECK_NUMBER (pid);
 #define handle_signal(NAME, VALUE)              \
  else if (!strcmp (name, NAME))                \
@@ -3916,7 +3916,7 @@ SIGCODE may be an integer, or a symbol whose name is a signal name.  */)
    {
      unsigned char *name;
-      CHECK_SYMBOL (sigcode, 1);
+      CHECK_SYMBOL (sigcode);
      name = XSYMBOL (sigcode)->name->data;
      if (0)
@@ -4516,7 +4516,7 @@ encode subprocess input.  */)
 {
  register struct Lisp_Process *p;
-  CHECK_PROCESS (proc, 0);
+  CHECK_PROCESS (proc);
  p = XPROCESS (proc);
  if (XINT (p->infd) < 0)
    error ("Input file descriptor of %s closed", XSTRING (p->name)->data);
@@ -4539,7 +4539,7 @@ DEFUN ("process-coding-system",
     (proc)
     register Lisp_Object proc;
 {
-  CHECK_PROCESS (proc, 0);
+  CHECK_PROCESS (proc);
  return Fcons (XPROCESS (proc)->decode_coding_system,
                XPROCESS (proc)->encode_coding_system);
 }
diff --git a/src/search.c b/src/search.c
index 55d1537c4ff..a7e27c88ecd 100644
--- a/src/search.c
+++ b/src/search.c
@@ -276,7 +276,7 @@ looking_at_1 (string, posix)
  if (running_asynch_code)
    save_search_regs ();
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  bufp = compile_pattern (string, &search_regs,
                          (!NILP (current_buffer->case_fold_search)
                           ? DOWNCASE_TABLE : Qnil),
@@ -365,8 +365,8 @@ string_match_1 (regexp, string, start, posix)
  if (running_asynch_code)
    save_search_regs ();
-  CHECK_STRING (regexp, 0);
+  CHECK_STRING (regexp);
-  CHECK_STRING (string, 1);
+  CHECK_STRING (string);
  if (NILP (start))
    pos = 0, pos_byte = 0;
@@ -374,7 +374,7 @@ string_match_1 (regexp, string, start, posix)
    {
      int len = XSTRING (string)->size;
-      CHECK_NUMBER (start, 2);
+      CHECK_NUMBER (start);
      pos = XINT (start);
      if (pos < 0 && -pos <= len)
        pos = len + pos;
@@ -872,11 +872,11 @@ search_command (string, bound, noerror, count, direction, RE, posix)
  if (!NILP (count))
    {
-      CHECK_NUMBER (count, 3);
+      CHECK_NUMBER (count);
      n *= XINT (count);
    }
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  if (NILP (bound))
    {
      if (n > 0)
@@ -886,7 +886,7 @@ search_command (string, bound, noerror, count, direction, RE, posix)
    }
  else
    {
-      CHECK_NUMBER_COERCE_MARKER (bound, 1);
+      CHECK_NUMBER_COERCE_MARKER (bound);
      lim = XINT (bound);
      if (n > 0 ? lim < PT : lim > PT)
        error ("Invalid search bound (wrong side of point)");
@@ -1943,7 +1943,7 @@ wordify (string)
  int prev_c = 0;
  int adjust;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  p = XSTRING (string)->data;
  len = XSTRING (string)->size;
@@ -2203,10 +2203,10 @@ since only regular expressions have distinguished subexpressions.  */)
  int sub;
  int opoint, newpoint;
-  CHECK_STRING (newtext, 0);
+  CHECK_STRING (newtext);
  if (! NILP (string))
-    CHECK_STRING (string, 4);
+    CHECK_STRING (string);
  case_action = nochange;       /* We tried an initialization */
                                /* but some C compilers blew it */
@@ -2218,7 +2218,7 @@ since only regular expressions have distinguished subexpressions.  */)
    sub = 0;
  else
    {
-      CHECK_NUMBER (subexp, 3);
+      CHECK_NUMBER (subexp);
      sub = XINT (subexp);
      if (sub < 0 || sub >= search_regs.num_regs)
        args_out_of_range (subexp, make_number (search_regs.num_regs));
@@ -2581,7 +2581,7 @@ match_limit (num, beginningp)
 {
  register int n;
-  CHECK_NUMBER (num, 0);
+  CHECK_NUMBER (num);
  n = XINT (num);
  if (n < 0 || n >= search_regs.num_regs)
    args_out_of_range (num, make_number (search_regs.num_regs));
@@ -2771,7 +2771,7 @@ LIST should have been created by calling `match-data' previously.  */)
                XSETBUFFER (last_thing_searched, XMARKER (marker)->buffer);
            }
-          CHECK_NUMBER_COERCE_MARKER (marker, 0);
+          CHECK_NUMBER_COERCE_MARKER (marker);
          from = XINT (marker);
          list = Fcdr (list);
@@ -2779,7 +2779,7 @@ LIST should have been created by calling `match-data' previously.  */)
          if (MARKERP (marker) && XMARKER (marker)->buffer == 0)
            XSETFASTINT (marker, 0);
-          CHECK_NUMBER_COERCE_MARKER (marker, 0);
+          CHECK_NUMBER_COERCE_MARKER (marker);
          search_regs.start[i] = from;
          search_regs.end[i] = XINT (marker);
        }
@@ -2842,7 +2842,7 @@ DEFUN ("regexp-quote", Fregexp_quote, Sregexp_quote, 1, 1, 0,
  register unsigned char *temp;
  int backslashes_added = 0;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  temp = (unsigned char *) alloca (STRING_BYTES (XSTRING (string)) * 2);
diff --git a/src/sunfns.c b/src/sunfns.c
index befe033b9a3..7319fca0357 100644
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -159,7 +159,7 @@ Redisplay does not happen if input is available before it starts.  */)
  struct timeval Timeout;
  int waitmask = 1;
  
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  Timeout.tv_sec = XINT(n) / 1000;
  Timeout.tv_usec = (XINT(n) - (Timeout.tv_sec * 1000)) * 1000;
@@ -187,7 +187,7 @@ DEFUN ("sleep-for-millisecs",
 {
  unsigned useconds;
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  useconds = XINT(n) * 1000;
  usleep(useconds);
  return(Qt);
@@ -230,15 +230,15 @@ expressed as a string.  If ICON is nil then the original arrow cursor is used.
    /*
     *  extract the data from the vector
     */
-    CHECK_VECTOR (Icon, 0);
+    CHECK_VECTOR (Icon);
    if (XVECTOR(Icon)->size < 3) return(Qnil);
    X_Hot = XVECTOR(Icon)->contents[0];
    Y_Hot = XVECTOR(Icon)->contents[1];
    Data = XVECTOR(Icon)->contents[2];
    
-    CHECK_NUMBER (X_Hot, 0);
+    CHECK_NUMBER (X_Hot);
-    CHECK_NUMBER (Y_Hot, 0);
+    CHECK_NUMBER (Y_Hot);
-    CHECK_STRING (Data, 0);
+    CHECK_STRING (Data);
    if (XSTRING(Data)->size != 32) return(Qnil);
    /*
     *  Setup the new cursor
@@ -324,7 +324,7 @@ DEFUN ("sun-set-selection", Fsun_set_selection, Ssun_set_selection, 1, 1,
 {
  struct selection selection;
-  CHECK_STRING (str, 0);
+  CHECK_STRING (str);
  Current_Selection = str;
  CHECK_GFX (Qnil);
@@ -363,7 +363,7 @@ sun_item_create (Pair)
  if (!CONSP(Pair)) wrong_type_argument(Qlistp, Pair);
  String = Fcar(Pair);
-  CHECK_STRING(String, 0);
+  CHECK_STRING(String);
  Value = Fcdr(Pair);
  if (SYMBOLP (Value))
    Value = SYMBOL_VALUE (Value);
@@ -384,7 +384,7 @@ sun_menu_create (Vector)
 {
  Menu menu;
  int i;
-  CHECK_VECTOR(Vector,0);
+  CHECK_VECTOR(Vector);
  menu=menu_create(0); 
  for(i = 0; i < XVECTOR(Vector)->size; i++) {
    menu_set (menu, MENU_APPEND_ITEM, 
@@ -445,11 +445,11 @@ as a menu label.  */)
  Event *event = &event0;
  Lisp_Object Value, Pair;
  
-  CHECK_NUMBER(X_Position, 0);
+  CHECK_NUMBER(X_Position);
-  CHECK_NUMBER(Y_Position, 1);
+  CHECK_NUMBER(Y_Position);
-  CHECK_LIVE_WINDOW(window, 2);
+  CHECK_LIVE_WINDOW(window);
-  CHECK_NUMBER(Button, 3);
+  CHECK_NUMBER(Button);
-  CHECK_VECTOR(MEnu, 4);
+  CHECK_VECTOR(MEnu);
  CHECK_GFX (Qnil);
diff --git a/src/syntax.c b/src/syntax.c
index ce4c4d6fff8..4c5bb546755 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -871,7 +871,7 @@ are listed in the documentation of `modify-syntax-entry'.  */)
  gl_state.current_syntax_table = current_buffer->syntax_table;
  gl_state.use_global = 0;
-  CHECK_NUMBER (character, 0);
+  CHECK_NUMBER (character);
  char_int = XINT (character);
  return make_number (syntax_code_spec[(int) SYNTAX (char_int)]);
 }
@@ -884,7 +884,7 @@ DEFUN ("matching-paren", Fmatching_paren, Smatching_paren, 1, 1, 0,
  int char_int, code;
  gl_state.current_syntax_table = current_buffer->syntax_table;
  gl_state.use_global = 0;
-  CHECK_NUMBER (character, 0);
+  CHECK_NUMBER (character);
  char_int = XINT (character);
  code = SYNTAX (char_int);
  if (code == Sopen || code == Sclose)
@@ -906,7 +906,7 @@ text property.  */)
  int val;
  Lisp_Object match;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  p = XSTRING (string)->data;
  code = (enum syntaxcode) syntax_spec_code[*p++];
@@ -1012,7 +1012,7 @@ usage: (modify-syntax-entry CHAR NEWENTRY &optional SYNTAX-TABLE) */)
     (c, newentry, syntax_table)
     Lisp_Object c, newentry, syntax_table;
 {
-  CHECK_NUMBER (c, 0);
+  CHECK_NUMBER (c);
  if (NILP (syntax_table))
    syntax_table = current_buffer->syntax_table;
@@ -1315,7 +1315,7 @@ and the function returns nil.  Field boundaries are not noticed if
     Lisp_Object count;
 {
  int orig_val, val;
-  CHECK_NUMBER (count, 0);
+  CHECK_NUMBER (count);
  val = orig_val = scan_words (PT, XINT (count));
  if (! orig_val)
@@ -1399,7 +1399,7 @@ skip_chars (forwardp, syntaxp, string, lim)
  unsigned char *str;
  int len;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  char_ranges = (int *) alloca (XSTRING (string)->size * (sizeof (int)) * 2);
  string_multibyte = STRING_MULTIBYTE (string);
  str = XSTRING (string)->data;
@@ -1427,7 +1427,7 @@ skip_chars (forwardp, syntaxp, string, lim)
  if (NILP (lim))
    XSETINT (lim, forwardp ? ZV : BEGV);
  else
-    CHECK_NUMBER_COERCE_MARKER (lim, 0);
+    CHECK_NUMBER_COERCE_MARKER (lim);
  /* In any case, don't allow scan outside bounds of buffer.  */
  if (XINT (lim) > ZV)
@@ -1822,7 +1822,7 @@ between them, return t; otherwise return nil.  */)
  int out_charpos, out_bytepos;
  int dummy;
-  CHECK_NUMBER (count, 0);
+  CHECK_NUMBER (count);
  count1 = XINT (count);
  stop = count1 > 0 ? ZV : BEGV;
@@ -2406,9 +2406,9 @@ If the depth is right but the count is not used up, nil is returned.  */)
     (from, count, depth)
     Lisp_Object from, count, depth;
 {
-  CHECK_NUMBER (from, 0);
+  CHECK_NUMBER (from);
-  CHECK_NUMBER (count, 1);
+  CHECK_NUMBER (count);
-  CHECK_NUMBER (depth, 2);
+  CHECK_NUMBER (depth);
  return scan_lists (XINT (from), XINT (count), XINT (depth), 0);
 }
@@ -2427,8 +2427,8 @@ but before count is used up, nil is returned.  */)
     (from, count)
     Lisp_Object from, count;
 {
-  CHECK_NUMBER (from, 0);
+  CHECK_NUMBER (from);
-  CHECK_NUMBER (count, 1);
+  CHECK_NUMBER (count);
  return scan_lists (XINT (from), XINT (count), 0, 1);
 }
@@ -2866,7 +2866,7 @@ Sixth arg COMMENTSTOP non-nil means stop at the start of a comment.
  if (!NILP (targetdepth))
    {
-      CHECK_NUMBER (targetdepth, 3);
+      CHECK_NUMBER (targetdepth);
      target = XINT (targetdepth);
    }
  else
diff --git a/src/textprop.c b/src/textprop.c
index 1f162c58db1..76600728d15 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -123,9 +123,9 @@ validate_interval_range (object, begin, end, force)
  register INTERVAL i;
  int searchpos;
-  CHECK_STRING_OR_BUFFER (object, 0);
+  CHECK_STRING_OR_BUFFER (object);
-  CHECK_NUMBER_COERCE_MARKER (*begin, 0);
+  CHECK_NUMBER_COERCE_MARKER (*begin);
-  CHECK_NUMBER_COERCE_MARKER (*end, 0);
+  CHECK_NUMBER_COERCE_MARKER (*end);
  /* If we are asked for a point, but from a subr which operates
     on a range, then return nothing.  */
@@ -505,7 +505,7 @@ interval_of (position, object)
  else if (EQ (object, Qt))
    return NULL_INTERVAL;
-  CHECK_STRING_OR_BUFFER (object, 0);
+  CHECK_STRING_OR_BUFFER (object);
  if (BUFFERP (object))
    {
@@ -589,7 +589,7 @@ get_char_property_and_overlay (position, prop, object, overlay)
 {
  struct window *w = 0;
-  CHECK_NUMBER_COERCE_MARKER (position, 0);
+  CHECK_NUMBER_COERCE_MARKER (position);
  if (NILP (object))
    XSETBUFFER (object, current_buffer);
@@ -687,7 +687,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
  temp = Fnext_overlay_change (position);
  if (! NILP (limit))
    {
-      CHECK_NUMBER (limit, 2);
+      CHECK_NUMBER (limit);
      if (XINT (limit) < XINT (temp))
        temp = limit;
    }
@@ -712,7 +712,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
  temp = Fprevious_overlay_change (position);
  if (! NILP (limit))
    {
-      CHECK_NUMBER (limit, 2);
+      CHECK_NUMBER (limit);
      if (XINT (limit) > XINT (temp))
        temp = limit;
    }
@@ -751,7 +751,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
      int count = specpdl_ptr - specpdl;
      if (! NILP (object))
-        CHECK_BUFFER (object, 0);
+        CHECK_BUFFER (object);
      
      if (BUFFERP (object) && current_buffer != XBUFFER (object))
        {
@@ -764,7 +764,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
      if (NILP (limit))
        XSETFASTINT (limit, BUF_ZV (current_buffer));
      else
-        CHECK_NUMBER_COERCE_MARKER (limit, 0);
+        CHECK_NUMBER_COERCE_MARKER (limit);
      for (;;)
        {
@@ -816,7 +816,7 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
      int count = specpdl_ptr - specpdl;
      if (! NILP (object))
-        CHECK_BUFFER (object, 0);
+        CHECK_BUFFER (object);
      
      if (BUFFERP (object) && current_buffer != XBUFFER (object))
        {
@@ -827,7 +827,7 @@ back past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
      if (NILP (limit))
        XSETFASTINT (limit, BUF_BEGV (current_buffer));
      else
-        CHECK_NUMBER_COERCE_MARKER (limit, 0);
+        CHECK_NUMBER_COERCE_MARKER (limit);
      if (XFASTINT (position) <= XFASTINT (limit))
        position = limit;
@@ -884,7 +884,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
    XSETBUFFER (object, current_buffer);
  if (! NILP (limit) && ! EQ (limit, Qt))
-    CHECK_NUMBER_COERCE_MARKER (limit, 0);
+    CHECK_NUMBER_COERCE_MARKER (limit);
  i = validate_interval_range (object, &position, &position, soft);
@@ -978,7 +978,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
    XSETBUFFER (object, current_buffer);
  if (!NILP (limit))
-    CHECK_NUMBER_COERCE_MARKER (limit, 0);
+    CHECK_NUMBER_COERCE_MARKER (limit);
  i = validate_interval_range (object, &position, &position, soft);
  if (NULL_INTERVAL_P (i))
@@ -1019,7 +1019,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.  */)
    XSETBUFFER (object, current_buffer);
  if (!NILP (limit))
-    CHECK_NUMBER_COERCE_MARKER (limit, 0);
+    CHECK_NUMBER_COERCE_MARKER (limit);
  i = validate_interval_range (object, &position, &position, soft);
  if (NULL_INTERVAL_P (i))
@@ -1065,7 +1065,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.  */)
    XSETBUFFER (object, current_buffer);
  if (!NILP (limit))
-    CHECK_NUMBER_COERCE_MARKER (limit, 0);
+    CHECK_NUMBER_COERCE_MARKER (limit);
  i = validate_interval_range (object, &position, &position, soft);
@@ -1562,7 +1562,7 @@ copy_text_properties (start, end, src, pos, dest, prop)
  if (NULL_INTERVAL_P (i))
    return Qnil;
-  CHECK_NUMBER_COERCE_MARKER (pos, 0);
+  CHECK_NUMBER_COERCE_MARKER (pos);
  {
    Lisp_Object dest_start, dest_end;
diff --git a/src/undo.c b/src/undo.c
index 0c87a599bcd..ec6f9d6b1db 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -407,7 +407,7 @@ Return what remains of the list.  */)
    list = Fcdr (list);
 #endif
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  arg = XINT (n);
  next = Qnil;
  GCPRO2 (next, list);
diff --git a/src/w16select.c b/src/w16select.c
index f92e1a8c173..f8a3733deb1 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -491,12 +491,12 @@ DEFUN ("w16-set-clipboard-data", Fw16_set_clipboard_data, Sw16_set_clipboard_dat
  int charset_info;
  int no_crlf_conversion;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  
  if (NILP (frame))
    frame = Fselected_frame ();
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  if ( !FRAME_MSDOS_P (XFRAME (frame)))
    goto done;
  
@@ -605,7 +605,7 @@ DEFUN ("w16-get-clipboard-data", Fw16_get_clipboard_data, Sw16_get_clipboard_dat
  if (NILP (frame))
    frame = Fselected_frame ();
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  if ( !FRAME_MSDOS_P (XFRAME (frame)))
    goto done;
  
@@ -701,7 +701,7 @@ and t is the same as `SECONDARY'.")
  (selection)
     Lisp_Object selection;
 {
-  CHECK_SYMBOL (selection, 0);
+  CHECK_SYMBOL (selection);
  /* Return nil for SECONDARY selection.  For PRIMARY (or nil)
     selection, check if there is some text on the kill-ring;
diff --git a/src/w32console.c b/src/w32console.c
index 5bd4ab1f3f4..41693c63a85 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -428,7 +428,7 @@ SOUND is nil to use the normal beep.")
     (sound)
     Lisp_Object sound;
 {
-  CHECK_SYMBOL (sound, 0);
+  CHECK_SYMBOL (sound);
  if (NILP (sound)) 
      sound_type = 0xFFFFFFFF;
diff --git a/src/w32fns.c b/src/w32fns.c
index 0c7f94fed89..def351562db 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -342,7 +342,7 @@ check_x_frame (frame)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  if (! FRAME_W32_P (f))
    error ("non-w32 frame used");
@@ -372,7 +372,7 @@ check_x_display_info (frame)
    {
      FRAME_PTR f;
-      CHECK_LIVE_FRAME (frame, 0);
+      CHECK_LIVE_FRAME (frame);
      f = XFRAME (frame);
      if (! FRAME_W32_P (f))
        error ("non-w32 frame used");
@@ -1079,10 +1079,10 @@ The original entry's RGB ref is returned, or nil if the entry is new.")
  Lisp_Object oldrgb = Qnil;
  Lisp_Object entry;
-  CHECK_NUMBER (red, 0);
+  CHECK_NUMBER (red);
-  CHECK_NUMBER (green, 0);
+  CHECK_NUMBER (green);
-  CHECK_NUMBER (blue, 0);
+  CHECK_NUMBER (blue);
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  XSET (rgb, Lisp_Int, RGB(XUINT (red), XUINT (green), XUINT (blue)));
@@ -1120,7 +1120,7 @@ where R,G,B are numbers between 0 and 255 and name is an arbitrary string.")
  Lisp_Object cmap = Qnil;
  Lisp_Object abspath;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  abspath = Fexpand_file_name (filename, Qnil);
  fp = fopen (XSTRING (filename)->data, "rt");
@@ -1432,7 +1432,7 @@ w32_to_x_color (rgb)
 {
  Lisp_Object color;
  
-  CHECK_NUMBER (rgb, 0);
+  CHECK_NUMBER (rgb);
  
  BLOCK_INPUT;
  
@@ -1891,7 +1891,7 @@ x_decode_color (f, arg, def)
 {
  XColor cdef;
-  CHECK_STRING (arg, 0);
+  CHECK_STRING (arg);
  if (strcmp (XSTRING (arg)->data, "black") == 0)
    return BLACK_PIX_DEFAULT (f);
@@ -2029,7 +2029,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!EQ (Qnil, Vx_pointer_shape))
    {
-      CHECK_NUMBER (Vx_pointer_shape, 0);
+      CHECK_NUMBER (Vx_pointer_shape);
      cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f), XINT (Vx_pointer_shape));
    }
  else
@@ -2038,7 +2038,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!EQ (Qnil, Vx_nontext_pointer_shape))
    {
-      CHECK_NUMBER (Vx_nontext_pointer_shape, 0);
+      CHECK_NUMBER (Vx_nontext_pointer_shape);
      nontext_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),
                                          XINT (Vx_nontext_pointer_shape));
    }
@@ -2048,7 +2048,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!EQ (Qnil, Vx_hourglass_pointer_shape))
    {
-      CHECK_NUMBER (Vx_hourglass_pointer_shape, 0);
+      CHECK_NUMBER (Vx_hourglass_pointer_shape);
      hourglass_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),
                                            XINT (Vx_hourglass_pointer_shape));
    }
@@ -2059,7 +2059,7 @@ x_set_mouse_color (f, arg, oldval)
  x_check_errors (FRAME_W32_DISPLAY (f), "bad nontext pointer cursor: %s");
  if (!EQ (Qnil, Vx_mode_pointer_shape))
    {
-      CHECK_NUMBER (Vx_mode_pointer_shape, 0);
+      CHECK_NUMBER (Vx_mode_pointer_shape);
      mode_cursor = XCreateFontCursor (FRAME_W32_DISPLAY (f),
                                       XINT (Vx_mode_pointer_shape));
    }
@@ -2069,7 +2069,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!EQ (Qnil, Vx_sensitive_text_pointer_shape))
    {
-      CHECK_NUMBER (Vx_sensitive_text_pointer_shape, 0);
+      CHECK_NUMBER (Vx_sensitive_text_pointer_shape);
      cross_cursor
        = XCreateFontCursor (FRAME_W32_DISPLAY (f),
                             XINT (Vx_sensitive_text_pointer_shape));
@@ -2079,7 +2079,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!NILP (Vx_window_horizontal_drag_shape))
    {
-      CHECK_NUMBER (Vx_window_horizontal_drag_shape, 0);
+      CHECK_NUMBER (Vx_window_horizontal_drag_shape);
      horizontal_drag_cursor
        = XCreateFontCursor (FRAME_X_DISPLAY (f),
                             XINT (Vx_window_horizontal_drag_shape));
@@ -2222,7 +2222,7 @@ x_set_border_color (f, arg, oldval)
 {
  int pix;
-  CHECK_STRING (arg, 0);
+  CHECK_STRING (arg);
  pix = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
  x_set_border_pixel (f, pix);
  update_face_from_frame_parameter (f, Qborder_color, arg);
@@ -2384,7 +2384,7 @@ x_set_font (f, arg, oldval)
  Lisp_Object frame;
  int old_fontset = FRAME_FONTSET(f);
-  CHECK_STRING (arg, 1);
+  CHECK_STRING (arg);
  fontset_name = Fquery_fontset (arg, Qnil);
@@ -2435,7 +2435,7 @@ x_set_border_width (f, arg, oldval)
     struct frame *f;
     Lisp_Object arg, oldval;
 {
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
  if (XINT (arg) == f->output_data.w32->border_width)
    return;
@@ -2453,7 +2453,7 @@ x_set_internal_border_width (f, arg, oldval)
 {
  int old = f->output_data.w32->internal_border_width;
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
  f->output_data.w32->internal_border_width = XINT (arg);
  if (f->output_data.w32->internal_border_width < 0)
    f->output_data.w32->internal_border_width = 0;
@@ -2675,7 +2675,7 @@ x_set_name (f, name, explicit)
      name = build_string (FRAME_W32_DISPLAY_INFO (f)->w32_id_name);
    }
  else
-    CHECK_STRING (name, 0);
+    CHECK_STRING (name);
  /* Don't change the name if it's already NAME.  */
  if (! NILP (Fstring_equal (name, f->name)))
@@ -2931,13 +2931,13 @@ and the class is `Emacs.CLASS.SUBCLASS'.")
  char *name_key;
  char *class_key;
-  CHECK_STRING (attribute, 0);
+  CHECK_STRING (attribute);
-  CHECK_STRING (class, 0);
+  CHECK_STRING (class);
  if (!NILP (component))
-    CHECK_STRING (component, 1);
+    CHECK_STRING (component);
  if (!NILP (subclass))
-    CHECK_STRING (subclass, 2);
+    CHECK_STRING (subclass);
  if (NILP (component) != NILP (subclass))
    error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither");
@@ -3140,7 +3140,7 @@ or a list (- N) meaning -N pixels relative to bottom/right corner.")
  unsigned int width, height;
  Lisp_Object result;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  geometry = XParseGeometry ((char *) XSTRING (string)->data,
                             &x, &y, &width, &height);
@@ -3218,12 +3218,12 @@ x_figure_window_size (f, parms)
    {
      if (!EQ (tem0, Qunbound))
        {
-          CHECK_NUMBER (tem0, 0);
+          CHECK_NUMBER (tem0);
          f->height = XINT (tem0);
        }
      if (!EQ (tem1, Qunbound))
        {
-          CHECK_NUMBER (tem1, 0);
+          CHECK_NUMBER (tem1);
          SET_FRAME_WIDTH (f, XINT (tem1));
        }
      if (!NILP (tem2) && !EQ (tem2, Qunbound))
@@ -3270,7 +3270,7 @@ x_figure_window_size (f, parms)
        f->output_data.w32->top_pos = 0;
      else
        {
-          CHECK_NUMBER (tem0, 0);
+          CHECK_NUMBER (tem0);
          f->output_data.w32->top_pos = XINT (tem0);
          if (f->output_data.w32->top_pos < 0)
            window_prompting |= YNegative;
@@ -3298,7 +3298,7 @@ x_figure_window_size (f, parms)
        f->output_data.w32->left_pos = 0;
      else
        {
-          CHECK_NUMBER (tem1, 0);
+          CHECK_NUMBER (tem1);
          f->output_data.w32->left_pos = XINT (tem1);
          if (f->output_data.w32->left_pos < 0)
            window_prompting |= XNegative;
@@ -5095,8 +5095,8 @@ x_icon (f, parms)
  icon_y = w32_get_arg (parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
  if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
    {
-      CHECK_NUMBER (icon_x, 0);
+      CHECK_NUMBER (icon_x);
-      CHECK_NUMBER (icon_y, 0);
+      CHECK_NUMBER (icon_y);
    }
  else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
    error ("Both left and top icon corners of icon must be specified");
@@ -5239,7 +5239,7 @@ This function is an internal primitive--use `make-frame' instead.")
  if (EQ (parent, Qunbound))
    parent = Qnil;
  if (! NILP (parent))
-    CHECK_NUMBER (parent, 0);
+    CHECK_NUMBER (parent);
  /* make_frame_without_minibuffer can run Lisp code and garbage collect.  */
  /* No need to protect DISPLAY because that's not used after passing
@@ -7208,7 +7208,7 @@ DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
  XColor foo;
  FRAME_PTR f = check_x_frame (frame);
-  CHECK_STRING (color, 1);
+  CHECK_STRING (color);
  if (w32_defined_color (f, XSTRING (color)->data, &foo, 0))
    return Qt;
@@ -7224,7 +7224,7 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
  XColor foo;
  FRAME_PTR f = check_x_frame (frame);
-  CHECK_STRING (color, 1);
+  CHECK_STRING (color);
  if (w32_defined_color (f, XSTRING (color)->data, &foo, 0))
    {
@@ -7534,7 +7534,7 @@ x_display_info_for_name (name)
  Lisp_Object names;
  struct w32_display_info *dpyinfo;
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  for (dpyinfo = &one_w32_display_info, names = w32_display_name_list;
       dpyinfo;
@@ -7575,9 +7575,9 @@ terminate Emacs if we can't open the connection.")
  unsigned char *xrm_option;
  struct w32_display_info *dpyinfo;
-  CHECK_STRING (display, 0);
+  CHECK_STRING (display);
  if (! NILP (xrm_string))
-    CHECK_STRING (xrm_string, 1);
+    CHECK_STRING (xrm_string);
  if (! EQ (Vwindow_system, intern ("w32")))
    error ("Not using Microsoft Windows");
@@ -12465,8 +12465,8 @@ selected frame.  Value is VALUE.")
  struct frame *f = check_x_frame (frame);
  Atom prop_atom;
-  CHECK_STRING (prop, 1);
+  CHECK_STRING (prop);
-  CHECK_STRING (value, 2);
+  CHECK_STRING (value);
  BLOCK_INPUT;
  prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);
@@ -12496,7 +12496,7 @@ FRAME nil or omitted means use the selected frame.  Value is PROP.")
  struct frame *f = check_x_frame (frame);
  Atom prop_atom;
-  CHECK_STRING (prop, 1);
+  CHECK_STRING (prop);
  BLOCK_INPUT;
  prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);
  XDeleteProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f), prop_atom);
@@ -12530,7 +12530,7 @@ value.")
  int actual_format;
  unsigned long actual_size, bytes_remaining;
-  CHECK_STRING (prop, 1);
+  CHECK_STRING (prop);
  BLOCK_INPUT;
  prop_atom = XInternAtom (FRAME_W32_DISPLAY (f), XSTRING (prop)->data, False);
  rc = XGetWindowProperty (FRAME_W32_DISPLAY (f), FRAME_W32_WINDOW (f),
@@ -13177,22 +13177,22 @@ Text larger than the specified size is clipped.")
  GCPRO4 (string, parms, frame, timeout);
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  f = check_x_frame (frame);
  if (NILP (timeout))
    timeout = make_number (5);
  else
-    CHECK_NATNUM (timeout, 2);
+    CHECK_NATNUM (timeout);
  if (NILP (dx))
    dx = make_number (5);
  else
-    CHECK_NUMBER (dx, 5);
+    CHECK_NUMBER (dx);
  
  if (NILP (dy))
    dy = make_number (-10);
  else
-    CHECK_NUMBER (dy, 6);
+    CHECK_NUMBER (dy);
  if (NILP (last_show_tip_args))
    last_show_tip_args = Fmake_vector (make_number (3), Qnil);
@@ -13406,8 +13406,8 @@ specified.  Ensure that file exists if MUSTMATCH is non-nil.")
  int use_dialog_p = 1;
  GCPRO5 (prompt, dir, default_filename, mustmatch, file);
-  CHECK_STRING (prompt, 0);
+  CHECK_STRING (prompt);
-  CHECK_STRING (dir, 1);
+  CHECK_STRING (dir);
  /* Create the dialog with PROMPT as title, using DIR as initial
     directory and using "*" as pattern.  */
@@ -13589,7 +13589,7 @@ If optional parameter FRAME is not specified, use selected frame.")
 {
  FRAME_PTR f = check_x_frame (frame);
-  CHECK_NUMBER (command, 0);
+  CHECK_NUMBER (command);
  PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, XINT (command), 0);
@@ -13621,7 +13621,7 @@ otherwise it is an integer representing a ShowWindow flag:\n\
 {
  Lisp_Object current_dir;
-  CHECK_STRING (document, 0);
+  CHECK_STRING (document);
  /* Encode filename and current directory.  */
  current_dir = ENCODE_FILE (current_buffer->directory);
@@ -13669,7 +13669,7 @@ w32_parse_hot_key (key)
  int w32_modifiers;
  struct gcpro gcpro1;
-  CHECK_VECTOR (key, 0);
+  CHECK_VECTOR (key);
  if (XFASTINT (Flength (key)) != 1)
    return Qnil;
@@ -13807,7 +13807,7 @@ DEFUN ("w32-reconstruct-hot-key", Fw32_reconstruct_hot_key, Sw32_reconstruct_hot
  int vk_code, w32_modifiers;
  Lisp_Object key;
-  CHECK_NUMBER (hotkeyid, 0);
+  CHECK_NUMBER (hotkeyid);
  vk_code = HOTKEY_VK_CODE (hotkeyid);
  w32_modifiers = HOTKEY_MODIFIERS (hotkeyid);
@@ -13873,7 +13873,7 @@ If the underlying system call fails, value is nil.")
 {
  Lisp_Object encoded, value;
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  filename = Fexpand_file_name (filename, Qnil);
  encoded = ENCODE_FILE (filename);
diff --git a/src/w32menu.c b/src/w32menu.c
index 1dd1ed63804..d35af3025d1 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -548,10 +548,10 @@ list_of_panes (menu)
      Lisp_Object elt, pane_name, pane_data;
      elt = Fcar (tail);
      pane_name = Fcar (elt);
-      CHECK_STRING (pane_name, 0);
+      CHECK_STRING (pane_name);
      push_menu_pane (pane_name, Qnil);
      pane_data = Fcdr (elt);
-      CHECK_CONS (pane_data, 0);
+      CHECK_CONS (pane_data);
      list_of_items (pane_data);
    }
@@ -575,9 +575,9 @@ list_of_items (pane)
        push_left_right_boundary ();
      else
        {
-          CHECK_CONS (item, 0);
+          CHECK_CONS (item);
          item1 = Fcar (item);
-          CHECK_STRING (item1, 1);
+          CHECK_STRING (item1);
          push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil);
        }
    }
@@ -678,8 +678,8 @@ cached information about equivalent key sequences.")
            }
        }
-      CHECK_NUMBER (x, 0);
+      CHECK_NUMBER (x);
-      CHECK_NUMBER (y, 0);
+      CHECK_NUMBER (y);
      /* Decode where to put the menu.  */
@@ -691,7 +691,7 @@ cached information about equivalent key sequences.")
        }
      else if (WINDOWP (window))
        {
-          CHECK_LIVE_WINDOW (window, 0);
+          CHECK_LIVE_WINDOW (window);
          f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
          xpos = (FONT_WIDTH (FRAME_FONT (f))
@@ -702,7 +702,7 @@ cached information about equivalent key sequences.")
      else
        /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
           but I don't want to make one now.  */
-        CHECK_WINDOW (window, 0);
+        CHECK_WINDOW (window);
      xpos += XINT (x);
      ypos += XINT (y);
@@ -774,7 +774,7 @@ cached information about equivalent key sequences.")
    {
      /* We were given an old-fashioned menu.  */
      title = Fcar (menu);
-      CHECK_STRING (title, 1);
+      CHECK_STRING (title);
      list_of_panes (Fcdr (menu));
@@ -875,13 +875,13 @@ on the left of the dialog box and all following items on the right.\n\
    f = XFRAME (window);
  else if (WINDOWP (window))
    {
-      CHECK_LIVE_WINDOW (window, 0);
+      CHECK_LIVE_WINDOW (window);
      f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
    }
  else
    /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
       but I don't want to make one now.  */
-    CHECK_WINDOW (window, 0);
+    CHECK_WINDOW (window);
 #ifndef HAVE_DIALOGS
  /* Display a menu with these alternatives
@@ -904,7 +904,7 @@ on the left of the dialog box and all following items on the right.\n\
    /* Decode the dialog items from what was specified.  */
    title = Fcar (contents);
-    CHECK_STRING (title, 1);
+    CHECK_STRING (title);
    list_of_panes (Fcons (contents, Qnil));
diff --git a/src/w32proc.c b/src/w32proc.c
index d2eb38fbfbd..a808bc5e001 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1712,7 +1712,7 @@ All path elements in FILENAME are converted to their short names.")
 {
  char shortname[MAX_PATH];
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  /* first expand it.  */
  filename = Fexpand_file_name (filename, Qnil);
@@ -1737,7 +1737,7 @@ All path elements in FILENAME are converted to their long names.")
 {
  char longname[ MAX_PATH ];
-  CHECK_STRING (filename, 0);
+  CHECK_STRING (filename);
  /* first expand it.  */
  filename = Fexpand_file_name (filename, Qnil);
@@ -1766,14 +1766,14 @@ If successful, the return value is t, otherwise nil.")
  DWORD  priority_class = NORMAL_PRIORITY_CLASS;
  Lisp_Object result = Qnil;
-  CHECK_SYMBOL (priority, 0);
+  CHECK_SYMBOL (priority);
  if (!NILP (process))
    {
      DWORD pid;
      child_process *cp;
-      CHECK_NUMBER (process, 0);
+      CHECK_NUMBER (process);
      /* Allow pid to be an internally generated one, or one obtained
         externally.  This is necessary because real pids on Win95 are
@@ -1825,7 +1825,7 @@ If LCID (a 16-bit number) is not a valid locale, the result is nil.")
  char abbrev_name[32] = { 0 };
  char full_name[256] = { 0 };
-  CHECK_NUMBER (lcid, 0);
+  CHECK_NUMBER (lcid);
  if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED))
    return Qnil;
@@ -1932,7 +1932,7 @@ If successful, the new locale id is returned, otherwise nil.")
     (lcid)
     Lisp_Object lcid;
 {
-  CHECK_NUMBER (lcid, 0);
+  CHECK_NUMBER (lcid);
  if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED))
    return Qnil;
@@ -1988,7 +1988,7 @@ If successful, the new CP is returned, otherwise nil.")
     (cp)
     Lisp_Object cp;
 {
-  CHECK_NUMBER (cp, 0);
+  CHECK_NUMBER (cp);
  if (!IsValidCodePage (XINT (cp)))
    return Qnil;
@@ -2015,7 +2015,7 @@ If successful, the new CP is returned, otherwise nil.")
     (cp)
     Lisp_Object cp;
 {
-  CHECK_NUMBER (cp, 0);
+  CHECK_NUMBER (cp);
  if (!IsValidCodePage (XINT (cp)))
    return Qnil;
@@ -2035,7 +2035,7 @@ Returns nil if the codepage is not valid.")
 {
  CHARSETINFO info;
-  CHECK_NUMBER (cp, 0);
+  CHECK_NUMBER (cp);
  if (!IsValidCodePage (XINT (cp)))
    return Qnil;
@@ -2093,9 +2093,9 @@ If successful, the new layout id is returned, otherwise nil.")
 {
  DWORD kl;
-  CHECK_CONS (layout, 0);
+  CHECK_CONS (layout);
-  CHECK_NUMBER (XCAR (layout), 0);
+  CHECK_NUMBER (XCAR (layout));
-  CHECK_NUMBER (XCDR (layout), 0);
+  CHECK_NUMBER (XCDR (layout));
  kl = (XINT (XCAR (layout)) & 0xffff)
    | (XINT (XCDR (layout)) << 16);
diff --git a/src/w32select.c b/src/w32select.c
index 520610ee961..8772a4bbe6c 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -58,7 +58,7 @@ DEFUN ("w32-open-clipboard", Fw32_open_clipboard, Sw32_open_clipboard, 0, 1, 0,
  BOOL ok = FALSE;
  
  if (!NILP (frame))
-    CHECK_LIVE_FRAME (frame, 0);
+    CHECK_LIVE_FRAME (frame);
  
  BLOCK_INPUT;
  
@@ -113,10 +113,10 @@ DEFUN ("w32-set-clipboard-data", Fw32_set_clipboard_data, Sw32_set_clipboard_dat
  unsigned char *src;
  unsigned char *dst;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  
  if (!NILP (frame))
-    CHECK_LIVE_FRAME (frame, 0);
+    CHECK_LIVE_FRAME (frame);
  
  BLOCK_INPUT;
@@ -257,7 +257,7 @@ DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data, Sw32_get_clipboard_dat
  Lisp_Object ret = Qnil;
  
  if (!NILP (frame))
-    CHECK_LIVE_FRAME (frame, 0);
+    CHECK_LIVE_FRAME (frame);
  
  BLOCK_INPUT;
  
@@ -404,7 +404,7 @@ and t is the same as `SECONDARY'.")
  (selection)
     Lisp_Object selection;
 {
-  CHECK_SYMBOL (selection, 0);
+  CHECK_SYMBOL (selection);
  /* Return nil for PRIMARY and SECONDARY selections; for CLIPBOARD, check
     if the clipboard currently has valid text format contents. */
diff --git a/src/window.c b/src/window.c
index 4ac39dde882..94a9678baac 100644
--- a/src/window.c
+++ b/src/window.c
@@ -294,7 +294,7 @@ used by that frame.  */)
 {
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  return FRAME_MINIBUF_WINDOW (XFRAME (frame));
 }
@@ -331,7 +331,7 @@ POS defaults to point in WINDOW; WINDOW defaults to the selected window.  */)
  if (!NILP (pos))
    {
-      CHECK_NUMBER_COERCE_MARKER (pos, 0);
+      CHECK_NUMBER_COERCE_MARKER (pos);
      posint = XINT (pos);
    }
  else if (w == XWINDOW (selected_window))
@@ -382,7 +382,7 @@ decode_window (window)
  if (NILP (window))
    return XWINDOW (selected_window);
-  CHECK_LIVE_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window);
  return XWINDOW (window);
 }
@@ -430,7 +430,7 @@ NCOL should be zero or positive.  */)
  struct window *w = decode_window (window);
  int hscroll;
-  CHECK_NUMBER (ncol, 1);
+  CHECK_NUMBER (ncol);
  hscroll = max (0, XINT (ncol));
  
  /* Prevent redisplay shortcuts when changing the hscroll.  */
@@ -678,14 +678,14 @@ If they are on the border between WINDOW and its right sibling,
  int x, y;
  Lisp_Object lx, ly;
-  CHECK_LIVE_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window);
  w = XWINDOW (window);
  f = XFRAME (w->frame);
-  CHECK_CONS (coordinates, 1);
+  CHECK_CONS (coordinates);
  lx = Fcar (coordinates);
  ly = Fcdr (coordinates);
-  CHECK_NUMBER_OR_FLOAT (lx, 1);
+  CHECK_NUMBER_OR_FLOAT (lx);
-  CHECK_NUMBER_OR_FLOAT (ly, 1);
+  CHECK_NUMBER_OR_FLOAT (ly);
  x = PIXEL_X_FROM_CANON_X (f, lx);
  y = PIXEL_Y_FROM_CANON_Y (f, ly);
@@ -816,12 +816,12 @@ column 0.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 2);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  /* Check that arguments are integers or floats.  */
-  CHECK_NUMBER_OR_FLOAT (x, 0);
+  CHECK_NUMBER_OR_FLOAT (x);
-  CHECK_NUMBER_OR_FLOAT (y, 1);
+  CHECK_NUMBER_OR_FLOAT (y);
  return window_from_coordinates (f, 
                                  PIXEL_X_FROM_CANON_X (f, x),
@@ -885,7 +885,7 @@ if it isn't already recorded.  */)
  Lisp_Object buf;
  buf = w->buffer;
-  CHECK_BUFFER (buf, 0);
+  CHECK_BUFFER (buf);
 #if 0 /* This change broke some things.  We should make it later.  */
  /* If we don't know the end position, return nil.
@@ -946,7 +946,7 @@ DEFUN ("set-window-point", Fset_window_point, Sset_window_point, 2, 2, 0,
 {
  register struct window *w = decode_window (window);
-  CHECK_NUMBER_COERCE_MARKER (pos, 1);
+  CHECK_NUMBER_COERCE_MARKER (pos);
  if (w == XWINDOW (selected_window)
      && XBUFFER (w->buffer) == current_buffer)
    Fgoto_char (pos);
@@ -970,7 +970,7 @@ from overriding motion of point in order to display at this exact start.  */)
 {
  register struct window *w = decode_window (window);
-  CHECK_NUMBER_COERCE_MARKER (pos, 1);
+  CHECK_NUMBER_COERCE_MARKER (pos);
  set_marker_restricted (w->start, pos, w->buffer);
  /* this is not right, but much easier than doing what is right. */
  w->start_at_line_beg = Qnil;
@@ -1195,7 +1195,7 @@ delete_window (window)
  if (NILP (window))
    window = selected_window;
  else
-    CHECK_WINDOW (window, 0);
+    CHECK_WINDOW (window);
  p = XWINDOW (window);
  /* It's okay to delete an already-deleted window.  */
@@ -1448,7 +1448,7 @@ decode_next_window_args (window, minibuf, all_frames)
  if (NILP (*window))
    *window = selected_window;
  else
-    CHECK_LIVE_WINDOW (*window, 0);
+    CHECK_LIVE_WINDOW (*window);
  
  /* MINIBUF nil may or may not include minibuffers.  Decide if it
     does.  */
@@ -1632,7 +1632,7 @@ argument ALL_FRAMES is non-nil, cycle through all frames.  */)
  Lisp_Object window;
  int i;
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
  window = selected_window;
  
  for (i = XINT (arg); i > 0; --i)
@@ -1990,7 +1990,7 @@ value is reasonable when this function is called.  */)
  if (NILP (window))
    window = selected_window;
  else
-    CHECK_LIVE_WINDOW (window, 0);
+    CHECK_LIVE_WINDOW (window);
  w = XWINDOW (window);
  startpos = marker_position (w->start);
@@ -2056,7 +2056,7 @@ If FRAME is a frame, search only that frame.  */)
  if (!NILP (buffer))
    {
      buffer = Fget_buffer (buffer);
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
      window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame);
    }
  
@@ -2073,7 +2073,7 @@ DEFUN ("replace-buffer-in-windows", Freplace_buffer_in_windows,
  if (!NILP (buffer))
    {
      buffer = Fget_buffer (buffer);
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
      window_loop (UNSHOW_BUFFER, buffer, 0, Qt);
    }
  return Qnil;
@@ -2660,7 +2660,7 @@ BUFFER can be a buffer or buffer name.  */)
  XSETWINDOW (window, w);
  buffer = Fget_buffer (buffer);
-  CHECK_BUFFER (buffer, 1);
+  CHECK_BUFFER (buffer);
  if (NILP (XBUFFER (buffer)->name))
    error ("Attempt to display deleted buffer");
@@ -2705,7 +2705,7 @@ select_window_1 (window, recordflag)
  register struct window *ow;
  struct frame *sf;
-  CHECK_LIVE_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window);
  w = XWINDOW (window);
  w->frozen_window_start_p = 0;
@@ -2802,7 +2802,7 @@ See `special-display-buffer-names', and `special-display-regexps'.  */)
 {
  Lisp_Object tem;
-  CHECK_STRING (buffer_name, 1);
+  CHECK_STRING (buffer_name);
  tem = Fmember (buffer_name, Vspecial_display_buffer_names);
  if (!NILP (tem))
@@ -2834,7 +2834,7 @@ See `same-window-buffer-names' and `same-window-regexps'.  */)
 {
  Lisp_Object tem;
-  CHECK_STRING (buffer_name, 1);
+  CHECK_STRING (buffer_name);
  tem = Fmember (buffer_name, Vsame_window_buffer_names);
  if (!NILP (tem))
@@ -2895,7 +2895,7 @@ displayed.  */)
  swp = Qnil;
  buffer = Fget_buffer (buffer);
-  CHECK_BUFFER (buffer, 0);
+  CHECK_BUFFER (buffer);
  if (!NILP (Vdisplay_buffer_function))
    return call2 (Vdisplay_buffer_function, buffer, not_this_window);
@@ -3165,7 +3165,7 @@ SIZE includes that window's scroll bar, or the divider column to its right.  */)
  if (NILP (window))
    window = selected_window;
  else
-    CHECK_LIVE_WINDOW (window, 0);
+    CHECK_LIVE_WINDOW (window);
  o = XWINDOW (window);
  fo = XFRAME (WINDOW_FRAME (o));
@@ -3183,7 +3183,7 @@ SIZE includes that window's scroll bar, or the divider column to its right.  */)
    }
  else
    {
-      CHECK_NUMBER (size, 1);
+      CHECK_NUMBER (size);
      size_int = XINT (size);
    }
@@ -3278,7 +3278,7 @@ Interactively, if an argument is not given, make the window one line bigger.  */
     (arg, side)
     register Lisp_Object arg, side;
 {
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
  enlarge_window (selected_window, XINT (arg), !NILP (side));
  if (! NILP (Vwindow_configuration_change_hook))
@@ -3294,7 +3294,7 @@ Interactively, if an argument is not given, make the window one line smaller.  *
     (arg, side)
     register Lisp_Object arg, side;
 {
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
  enlarge_window (selected_window, -XINT (arg), !NILP (side));
  if (! NILP (Vwindow_configuration_change_hook))
@@ -4349,7 +4349,7 @@ showing that buffer is used.  */)
               && ! EQ (window, selected_window));
    }
-  CHECK_LIVE_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window);
  if (EQ (window, selected_window))
    error ("There is no other window");
@@ -4394,7 +4394,7 @@ showing that buffer, popping the buffer up if necessary.  */)
    {
      if (CONSP (arg))
        arg = Fcar (arg);
-      CHECK_NUMBER (arg, 0);
+      CHECK_NUMBER (arg);
      window_scroll (window, XINT (arg), 0, 1);
    }
@@ -4549,7 +4549,7 @@ and redisplay normally--don't erase and redraw the frame.  */)
  else
    {
      arg = Fprefix_numeric_value (arg);
-      CHECK_NUMBER (arg, 0);
+      CHECK_NUMBER (arg);
    }
  set_buffer_internal (buf);
@@ -5271,7 +5271,7 @@ redirection (see `redirect-frame-focus').  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  n_windows = count_windows (XWINDOW (FRAME_ROOT_WINDOW (f)));
@@ -5340,9 +5340,9 @@ A nil width parameter means no margin.  */)
  struct window *w = decode_window (window);
  if (!NILP (left))
-    CHECK_NUMBER_OR_FLOAT (left, 1);
+    CHECK_NUMBER_OR_FLOAT (left);
  if (!NILP (right))
-    CHECK_NUMBER_OR_FLOAT (right, 2);
+    CHECK_NUMBER_OR_FLOAT (right);
  /* Check widths < 0 and translate a zero width to nil.
     Margins that are too wide have to be checked elsewhere.  */
@@ -5401,7 +5401,7 @@ Value is a multiple of the canonical character height of WINDOW.  */)
  if (NILP (window))
    window = selected_window;
  else
-    CHECK_WINDOW (window, 0);
+    CHECK_WINDOW (window);
  w = XWINDOW (window);
  f = XFRAME (w->frame);
  
@@ -5427,8 +5427,8 @@ non-negative multiple of the canonical character height of WINDOW.  */)
  if (NILP (window))
    window = selected_window;
  else
-    CHECK_WINDOW (window, 0);
+    CHECK_WINDOW (window);
-  CHECK_NUMBER_OR_FLOAT (vscroll, 1);
+  CHECK_NUMBER_OR_FLOAT (vscroll);
  
  w = XWINDOW (window);
  f = XFRAME (w->frame);
diff --git a/src/xdisp.c b/src/xdisp.c
index 63a94691875..56da6ed040a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7816,7 +7816,7 @@ DEFUN ("tool-bar-lines-needed", Ftool_bar_lines_needed, Stool_bar_lines_needed,
  if (NILP (frame))
    frame = selected_frame;
  else
-    CHECK_FRAME (frame, 0);
+    CHECK_FRAME (frame);
  f = XFRAME (frame);
  
  if (WINDOWP (f->tool_bar_window)
@@ -12203,7 +12203,7 @@ GLYPH > 1 or omitted means dump glyphs in long form.  */)
  struct glyph_matrix *matrix;
  int vpos;
  
-  CHECK_NUMBER (row, 0);
+  CHECK_NUMBER (row);
  matrix = XWINDOW (selected_window)->current_matrix;
  vpos = XINT (row);
  if (vpos >= 0 && vpos < matrix->nrows)
@@ -12226,7 +12226,7 @@ GLYPH > 1 or omitted means dump glyphs in long form.  */)
  struct glyph_matrix *m = XWINDOW (sf->tool_bar_window)->current_matrix;
  int vpos;
  
-  CHECK_NUMBER (row, 0);
+  CHECK_NUMBER (row);
  vpos = XINT (row);
  if (vpos >= 0 && vpos < m->nrows)
    dump_glyph_row (MATRIX_ROW (m, vpos), vpos,
diff --git a/src/xfaces.c b/src/xfaces.c
index cb0c47643f3..afbf3e92d08 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -875,7 +875,7 @@ frame_or_selected_frame (frame, nparam)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, nparam);
+  CHECK_LIVE_FRAME (frame);
  return XFRAME (frame);
 }
@@ -1490,8 +1490,8 @@ If FRAME is nil or omitted, use the selected frame.  */)
 {
  struct frame *f;
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
-  CHECK_STRING (color, 0);
+  CHECK_STRING (color);
  f = XFRAME (frame);
  return face_color_gray_p (f, XSTRING (color)->data) ? Qt : Qnil;
 }
@@ -1508,8 +1508,8 @@ COLOR must be a valid color name.  */)
 {
  struct frame *f;
-  CHECK_FRAME (frame, 0);
+  CHECK_FRAME (frame);
-  CHECK_STRING (color, 0);
+  CHECK_STRING (color);
  f = XFRAME (frame);
  if (face_color_supported_p (f, XSTRING (color)->data, !NILP (background_p)))
    return Qt;
@@ -2720,7 +2720,7 @@ the face font sort order.  */)
  struct gcpro gcpro1;
  if (!NILP (family))
-    CHECK_STRING (family, 1);
+    CHECK_STRING (family);
  result = Qnil;
  GCPRO1 (result);
@@ -2829,18 +2829,18 @@ the WIDTH times as wide as FACE on FRAME.  */)
  int maxnames;
  check_x ();
-  CHECK_STRING (pattern, 0);
+  CHECK_STRING (pattern);
  if (NILP (maximum))
    maxnames = 2000;
  else
    {
-      CHECK_NATNUM (maximum, 0);
+      CHECK_NATNUM (maximum);
      maxnames = XINT (maximum);
    }
  if (!NILP (width))
-    CHECK_NUMBER (width, 4);
+    CHECK_NUMBER (width);
  /* We can't simply call check_x_frame because this function may be
     called before any frame is created.  */
@@ -3626,12 +3626,12 @@ Value is a vector of face attributes.  */)
  struct frame *f;
  int i;
-  CHECK_SYMBOL (face, 0);
+  CHECK_SYMBOL (face);
  global_lface = lface_from_face_name (NULL, face, 0);
  if (!NILP (frame))
    {
-      CHECK_LIVE_FRAME (frame, 1);
+      CHECK_LIVE_FRAME (frame);
      f = XFRAME (frame);
      lface = lface_from_face_name (f, face, 0);
    }
@@ -3703,7 +3703,7 @@ Otherwise check for the existence of a global face.  */)
  if (!NILP (frame))
    {
-      CHECK_LIVE_FRAME (frame, 1);
+      CHECK_LIVE_FRAME (frame);
      lface = lface_from_face_name (XFRAME (frame), face, 0);
    }
  else
@@ -3727,8 +3727,8 @@ Value is TO.  */)
 {
  Lisp_Object lface, copy;
-  CHECK_SYMBOL (from, 0);
+  CHECK_SYMBOL (from);
-  CHECK_SYMBOL (to, 1);
+  CHECK_SYMBOL (to);
  if (NILP (new_frame))
    new_frame = frame;
@@ -3742,8 +3742,8 @@ Value is TO.  */)
  else
    {
      /* Copy frame-local definition of FROM.  */
-      CHECK_LIVE_FRAME (frame, 2);
+      CHECK_LIVE_FRAME (frame);
-      CHECK_LIVE_FRAME (new_frame, 3);
+      CHECK_LIVE_FRAME (new_frame);
      lface = lface_from_face_name (XFRAME (frame), from, 1);
      copy = Finternal_make_lisp_face (to, new_frame);
    }
@@ -3773,8 +3773,8 @@ FRAME 0 means change the face on all frames, and change the default
  /* Set 1 if ATTR is one of font-related attributes other than QCfont.  */
  int font_related_attr_p = 0;
-  CHECK_SYMBOL (face, 0);
+  CHECK_SYMBOL (face);
-  CHECK_SYMBOL (attr, 1);
+  CHECK_SYMBOL (attr);
  face = resolve_face_name (face);
@@ -3797,7 +3797,7 @@ FRAME 0 means change the face on all frames, and change the default
      if (NILP (frame))
        frame = selected_frame;
-      CHECK_LIVE_FRAME (frame, 3);
+      CHECK_LIVE_FRAME (frame);
      lface = lface_from_face_name (XFRAME (frame), face, 0);
      /* If a frame-local face doesn't exist yet, create one.  */
@@ -3809,7 +3809,7 @@ FRAME 0 means change the face on all frames, and change the default
    {
      if (!UNSPECIFIEDP (value))
        {
-          CHECK_STRING (value, 3);
+          CHECK_STRING (value);
          if (XSTRING (value)->size == 0)
            signal_error ("Invalid face family", value);
        }
@@ -3842,7 +3842,7 @@ FRAME 0 means change the face on all frames, and change the default
    {
      if (!UNSPECIFIEDP (value))
        {
-          CHECK_SYMBOL (value, 3);
+          CHECK_SYMBOL (value);
          if (face_numeric_weight (value) < 0)
            signal_error ("Invalid face weight", value);
        }
@@ -3854,7 +3854,7 @@ FRAME 0 means change the face on all frames, and change the default
    {
      if (!UNSPECIFIEDP (value))
        {
-          CHECK_SYMBOL (value, 3);
+          CHECK_SYMBOL (value);
          if (face_numeric_slant (value) < 0)
            signal_error ("Invalid face slant", value);
        }
@@ -3972,7 +3972,7 @@ FRAME 0 means change the face on all frames, and change the default
    {
      if (!UNSPECIFIEDP (value))
        {
-          CHECK_SYMBOL (value, 3);
+          CHECK_SYMBOL (value);
          if (!EQ (value, Qt) && !NILP (value))
            signal_error ("Invalid inverse-video face attribute value", value);
        }
@@ -3986,7 +3986,7 @@ FRAME 0 means change the face on all frames, and change the default
          /* Don't check for valid color names here because it depends
             on the frame (display) whether the color will be valid
             when the face is realized.  */
-          CHECK_STRING (value, 3);
+          CHECK_STRING (value);
          if (XSTRING (value)->size == 0)
            signal_error ("Empty foreground color value", value);
        }
@@ -4000,7 +4000,7 @@ FRAME 0 means change the face on all frames, and change the default
          /* Don't check for valid color names here because it depends
             on the frame (display) whether the color will be valid
             when the face is realized.  */
-          CHECK_STRING (value, 3);
+          CHECK_STRING (value);
          if (XSTRING (value)->size == 0)
            signal_error ("Empty background color value", value);
        }
@@ -4022,7 +4022,7 @@ FRAME 0 means change the face on all frames, and change the default
    {
      if (!UNSPECIFIEDP (value))
        {
-          CHECK_SYMBOL (value, 3);
+          CHECK_SYMBOL (value);
          if (face_numeric_swidth (value) < 0)
            signal_error ("Invalid face width", value);
        }
@@ -4040,7 +4040,7 @@ FRAME 0 means change the face on all frames, and change the default
          struct frame *f;
          Lisp_Object tmp;
-          CHECK_STRING (value, 3);
+          CHECK_STRING (value);
          if (EQ (frame, Qt))
            f = SELECTED_FRAME ();
          else
@@ -4314,9 +4314,9 @@ DEFUN ("internal-face-x-get-resource", Finternal_face_x_get_resource,
  Lisp_Object value = Qnil;
 #ifndef WINDOWSNT
 #ifndef macintosh
-  CHECK_STRING (resource, 0);
+  CHECK_STRING (resource);
-  CHECK_STRING (class, 1);
+  CHECK_STRING (class);
-  CHECK_LIVE_FRAME (frame, 2);
+  CHECK_LIVE_FRAME (frame);
  BLOCK_INPUT;
  value = display_x_get_resource (FRAME_X_DISPLAY_INFO (XFRAME (frame)),
                                  resource, class, Qnil, Qnil);
@@ -4363,9 +4363,9 @@ DEFUN ("internal-set-lisp-face-attribute-from-resource",
     (face, attr, value, frame)
     Lisp_Object face, attr, value, frame;
 {
-  CHECK_SYMBOL (face, 0);
+  CHECK_SYMBOL (face);
-  CHECK_SYMBOL (attr, 1);
+  CHECK_SYMBOL (attr);
-  CHECK_STRING (value, 2);
+  CHECK_STRING (value);
  if (xstricmp (XSTRING (value)->data, "unspecified") == 0)
    value = Qunspecified;
@@ -4532,8 +4532,8 @@ frames).  If FRAME is omitted or nil, use the selected frame.  */)
 {
  Lisp_Object lface, value = Qnil;
-  CHECK_SYMBOL (symbol, 0);
+  CHECK_SYMBOL (symbol);
-  CHECK_SYMBOL (keyword, 1);
+  CHECK_SYMBOL (keyword);
  if (EQ (frame, Qt))
    lface = lface_from_face_name (NULL, symbol, 1);
@@ -4541,7 +4541,7 @@ frames).  If FRAME is omitted or nil, use the selected frame.  */)
    {
      if (NILP (frame))
        frame = selected_frame;
-      CHECK_LIVE_FRAME (frame, 2);
+      CHECK_LIVE_FRAME (frame);
      lface = lface_from_face_name (XFRAME (frame), symbol, 1);
    }
@@ -4593,7 +4593,7 @@ Value is nil if ATTR doesn't have a discrete set of valid values.  */)
 {
  Lisp_Object result = Qnil;
-  CHECK_SYMBOL (attr, 0);
+  CHECK_SYMBOL (attr);
  if (EQ (attr, QCweight)
      || EQ (attr, QCslant)
@@ -4646,7 +4646,7 @@ Default face attributes override any local face attributes.  */)
  int i;
  Lisp_Object global_lface, local_lface, *gvec, *lvec;
-  CHECK_LIVE_FRAME (frame, 1);
+  CHECK_LIVE_FRAME (frame);
  global_lface = lface_from_face_name (NULL, face, 1);
  local_lface = lface_from_face_name (XFRAME (frame), face, 0);
  if (NILP (local_lface))
@@ -4800,7 +4800,7 @@ If FRAME is omitted or nil, use the selected frame.  */)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  if (EQ (frame, Qt))
@@ -5526,7 +5526,7 @@ Value is ORDER.  */)
  int i;
  int indices[DIM (font_sort_order)];
-  CHECK_LIST (order, 0);
+  CHECK_LIST (order);
  bzero (indices, sizeof indices);
  i = 0;
@@ -5579,7 +5579,7 @@ be found.  Value is ALIST.  */)
     (alist)
     Lisp_Object alist;
 {
-  CHECK_LIST (alist, 0);
+  CHECK_LIST (alist);
  Vface_alternative_font_family_alist = alist;
  free_all_realized_faces (Qnil);
  return alist;
@@ -5596,7 +5596,7 @@ be found.  Value is ALIST.  */)
     (alist)
     Lisp_Object alist;
 {
-  CHECK_LIST (alist, 0);
+  CHECK_LIST (alist);
  Vface_alternative_font_registry_alist = alist;
  free_all_realized_faces (Qnil);
  return alist;
@@ -7039,7 +7039,7 @@ DEFUN ("dump-face", Fdump_face, Sdump_face, 0, 1, 0, doc: /* */)
  else
    {
      struct face *face;
-      CHECK_NUMBER (n, 0);
+      CHECK_NUMBER (n);
      face = FACE_FROM_ID (SELECTED_FRAME (), XINT (n));
      if (face == NULL)
        error ("Not a valid face");
diff --git a/src/xfns.c b/src/xfns.c
index e034cb6676b..fe1f0b0f449 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -261,7 +261,7 @@ check_x_frame (frame)
  if (NILP (frame))
    frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
  f = XFRAME (frame);
  if (! FRAME_X_P (f))
    error ("Non-X frame used");
@@ -295,7 +295,7 @@ check_x_display_info (frame)
    {
      FRAME_PTR f;
-      CHECK_LIVE_FRAME (frame, 0);
+      CHECK_LIVE_FRAME (frame);
      f = XFRAME (frame);
      if (! FRAME_X_P (f))
        error ("Non-X frame used");
@@ -1264,7 +1264,7 @@ x_decode_color (f, color_name, mono_color)
 {
  XColor cdef;
-  CHECK_STRING (color_name, 0);
+  CHECK_STRING (color_name);
 #if 0 /* Don't do this.  It's wrong when we're not using the default
         colormap, it makes freeing difficult, and it's probably not
@@ -1466,7 +1466,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!NILP (Vx_pointer_shape))
    {
-      CHECK_NUMBER (Vx_pointer_shape, 0);
+      CHECK_NUMBER (Vx_pointer_shape);
      cursor = XCreateFontCursor (dpy, XINT (Vx_pointer_shape));
    }
  else
@@ -1475,7 +1475,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!NILP (Vx_nontext_pointer_shape))
    {
-      CHECK_NUMBER (Vx_nontext_pointer_shape, 0);
+      CHECK_NUMBER (Vx_nontext_pointer_shape);
      nontext_cursor
        = XCreateFontCursor (dpy, XINT (Vx_nontext_pointer_shape));
    }
@@ -1485,7 +1485,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!NILP (Vx_hourglass_pointer_shape))
    {
-      CHECK_NUMBER (Vx_hourglass_pointer_shape, 0);
+      CHECK_NUMBER (Vx_hourglass_pointer_shape);
      hourglass_cursor
        = XCreateFontCursor (dpy, XINT (Vx_hourglass_pointer_shape));
    }
@@ -1496,7 +1496,7 @@ x_set_mouse_color (f, arg, oldval)
  x_check_errors (dpy, "bad nontext pointer cursor: %s");
  if (!NILP (Vx_mode_pointer_shape))
    {
-      CHECK_NUMBER (Vx_mode_pointer_shape, 0);
+      CHECK_NUMBER (Vx_mode_pointer_shape);
      mode_cursor = XCreateFontCursor (dpy, XINT (Vx_mode_pointer_shape));
    }
  else
@@ -1505,7 +1505,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!NILP (Vx_sensitive_text_pointer_shape))
    {
-      CHECK_NUMBER (Vx_sensitive_text_pointer_shape, 0);
+      CHECK_NUMBER (Vx_sensitive_text_pointer_shape);
      cross_cursor
        = XCreateFontCursor (dpy, XINT (Vx_sensitive_text_pointer_shape));
    }
@@ -1514,7 +1514,7 @@ x_set_mouse_color (f, arg, oldval)
  if (!NILP (Vx_window_horizontal_drag_shape))
    {
-      CHECK_NUMBER (Vx_window_horizontal_drag_shape, 0);
+      CHECK_NUMBER (Vx_window_horizontal_drag_shape);
      horizontal_drag_cursor
        = XCreateFontCursor (dpy, XINT (Vx_window_horizontal_drag_shape));
    }
@@ -1668,7 +1668,7 @@ x_set_border_color (f, arg, oldval)
 {
  int pix;
-  CHECK_STRING (arg, 0);
+  CHECK_STRING (arg);
  pix = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
  x_set_border_pixel (f, pix);
  update_face_from_frame_parameter (f, Qborder_color, arg);
@@ -1847,7 +1847,7 @@ x_set_font (f, arg, oldval)
  Lisp_Object frame;
  int old_fontset = f->output_data.x->fontset;
-  CHECK_STRING (arg, 1);
+  CHECK_STRING (arg);
  fontset_name = Fquery_fontset (arg, Qnil);
@@ -1898,7 +1898,7 @@ x_set_border_width (f, arg, oldval)
     struct frame *f;
     Lisp_Object arg, oldval;
 {
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
  if (XINT (arg) == f->output_data.x->border_width)
    return;
@@ -1916,7 +1916,7 @@ x_set_internal_border_width (f, arg, oldval)
 {
  int old = f->output_data.x->internal_border_width;
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
  f->output_data.x->internal_border_width = XINT (arg);
  if (f->output_data.x->internal_border_width < 0)
    f->output_data.x->internal_border_width = 0;
@@ -2291,7 +2291,7 @@ x_set_name (f, name, explicit)
      name = build_string (FRAME_X_DISPLAY_INFO (f)->x_id_name);
    }
  else
-    CHECK_STRING (name, 0);
+    CHECK_STRING (name);
  /* Don't change the name if it's already NAME.  */
  if (! NILP (Fstring_equal (name, f->name)))
@@ -2409,7 +2409,7 @@ x_set_title (f, name, old_name)
  if (NILP (name))
    name = f->name;
  else
-    CHECK_STRING (name, 0);
+    CHECK_STRING (name);
  if (FRAME_X_WINDOW (f))
    {
@@ -2659,13 +2659,13 @@ and the class is `Emacs.CLASS.SUBCLASS'.  */)
  check_x ();
-  CHECK_STRING (attribute, 0);
+  CHECK_STRING (attribute);
-  CHECK_STRING (class, 0);
+  CHECK_STRING (class);
  if (!NILP (component))
-    CHECK_STRING (component, 1);
+    CHECK_STRING (component);
  if (!NILP (subclass))
-    CHECK_STRING (subclass, 2);
+    CHECK_STRING (subclass);
  if (NILP (component) != NILP (subclass))
    error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither");
@@ -2725,13 +2725,13 @@ display_x_get_resource (dpyinfo, attribute, class, component, subclass)
  char *name_key;
  char *class_key;
-  CHECK_STRING (attribute, 0);
+  CHECK_STRING (attribute);
-  CHECK_STRING (class, 0);
+  CHECK_STRING (class);
  if (!NILP (component))
-    CHECK_STRING (component, 1);
+    CHECK_STRING (component);
  if (!NILP (subclass))
-    CHECK_STRING (subclass, 2);
+    CHECK_STRING (subclass);
  if (NILP (component) != NILP (subclass))
    error ("x-get-resource: must specify both COMPONENT and SUBCLASS or neither");
@@ -3012,7 +3012,7 @@ or a list (- N) meaning -N pixels relative to bottom/right corner.  */)
  unsigned int width, height;
  Lisp_Object result;
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  geometry = XParseGeometry ((char *) XSTRING (string)->data,
                             &x, &y, &width, &height);
@@ -3091,12 +3091,12 @@ x_figure_window_size (f, parms)
    {
      if (!EQ (tem0, Qunbound))
        {
-          CHECK_NUMBER (tem0, 0);
+          CHECK_NUMBER (tem0);
          f->height = XINT (tem0);
        }
      if (!EQ (tem1, Qunbound))
        {
-          CHECK_NUMBER (tem1, 0);
+          CHECK_NUMBER (tem1);
          SET_FRAME_WIDTH (f, XINT (tem1));
        }
      if (!NILP (tem2) && !EQ (tem2, Qunbound))
@@ -3141,7 +3141,7 @@ x_figure_window_size (f, parms)
        f->output_data.x->top_pos = 0;
      else
        {
-          CHECK_NUMBER (tem0, 0);
+          CHECK_NUMBER (tem0);
          f->output_data.x->top_pos = XINT (tem0);
          if (f->output_data.x->top_pos < 0)
            window_prompting |= YNegative;
@@ -3169,7 +3169,7 @@ x_figure_window_size (f, parms)
        f->output_data.x->left_pos = 0;
      else
        {
-          CHECK_NUMBER (tem1, 0);
+          CHECK_NUMBER (tem1);
          f->output_data.x->left_pos = XINT (tem1);
          if (f->output_data.x->left_pos < 0)
            window_prompting |= XNegative;
@@ -3922,8 +3922,8 @@ x_icon (f, parms)
  icon_y = x_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
  if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
    {
-      CHECK_NUMBER (icon_x, 0);
+      CHECK_NUMBER (icon_x);
-      CHECK_NUMBER (icon_y, 0);
+      CHECK_NUMBER (icon_y);
    }
  else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
    error ("Both left and top icon corners of icon must be specified");
@@ -4147,7 +4147,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
  if (EQ (parent, Qunbound))
    parent = Qnil;
  if (! NILP (parent))
-    CHECK_NUMBER (parent, 0);
+    CHECK_NUMBER (parent);
  /* make_frame_without_minibuffer can run Lisp code and garbage collect.  */
  /* No need to protect DISPLAY because that's not used after passing
@@ -4583,7 +4583,7 @@ DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
  XColor foo;
  FRAME_PTR f = check_x_frame (frame);
-  CHECK_STRING (color, 1);
+  CHECK_STRING (color);
  if (x_defined_color (f, XSTRING (color)->data, &foo, 0))
    return Qt;
@@ -4599,7 +4599,7 @@ DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
  XColor foo;
  FRAME_PTR f = check_x_frame (frame);
-  CHECK_STRING (color, 1);
+  CHECK_STRING (color);
  if (x_defined_color (f, XSTRING (color)->data, &foo, 0))
    {
@@ -5079,7 +5079,7 @@ x_display_info_for_name (name)
  Lisp_Object names;
  struct x_display_info *dpyinfo;
-  CHECK_STRING (name, 0);
+  CHECK_STRING (name);
  if (! EQ (Vwindow_system, intern ("x")))
    error ("Not using X Windows");
@@ -5125,9 +5125,9 @@ terminate Emacs if we can't open the connection.  */)
  unsigned char *xrm_option;
  struct x_display_info *dpyinfo;
-  CHECK_STRING (display, 0);
+  CHECK_STRING (display);
  if (! NILP (xrm_string))
-    CHECK_STRING (xrm_string, 1);
+    CHECK_STRING (xrm_string);
  if (! EQ (Vwindow_system, intern ("x")))
    error ("Not using X Windows");
@@ -10409,8 +10409,8 @@ selected frame.  Value is VALUE.  */)
  struct frame *f = check_x_frame (frame);
  Atom prop_atom;
-  CHECK_STRING (prop, 1);
+  CHECK_STRING (prop);
-  CHECK_STRING (value, 2);
+  CHECK_STRING (value);
  BLOCK_INPUT;
  prop_atom = XInternAtom (FRAME_X_DISPLAY (f), XSTRING (prop)->data, False);
@@ -10436,7 +10436,7 @@ FRAME nil or omitted means use the selected frame.  Value is PROP.  */)
  struct frame *f = check_x_frame (frame);
  Atom prop_atom;
-  CHECK_STRING (prop, 1);
+  CHECK_STRING (prop);
  BLOCK_INPUT;
  prop_atom = XInternAtom (FRAME_X_DISPLAY (f), XSTRING (prop)->data, False);
  XDeleteProperty (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), prop_atom);
@@ -10467,7 +10467,7 @@ value.  */)
  int actual_format;
  unsigned long actual_size, bytes_remaining;
-  CHECK_STRING (prop, 1);
+  CHECK_STRING (prop);
  BLOCK_INPUT;
  prop_atom = XInternAtom (FRAME_X_DISPLAY (f), XSTRING (prop)->data, False);
  rc = XGetWindowProperty (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
@@ -11132,22 +11132,22 @@ Text larger than the specified size is clipped.  */)
  GCPRO4 (string, parms, frame, timeout);
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  f = check_x_frame (frame);
  if (NILP (timeout))
    timeout = make_number (5);
  else
-    CHECK_NATNUM (timeout, 2);
+    CHECK_NATNUM (timeout);
  
  if (NILP (dx))
    dx = make_number (5);
  else
-    CHECK_NUMBER (dx, 5);
+    CHECK_NUMBER (dx);
  
  if (NILP (dy))
    dy = make_number (-10);
  else
-    CHECK_NUMBER (dy, 6);
+    CHECK_NUMBER (dy);
  if (NILP (last_show_tip_args))
    last_show_tip_args = Fmake_vector (make_number (3), Qnil);
@@ -11412,8 +11412,8 @@ selection dialog's entry field, if MUSTMATCH is non-nil.  */)
  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
  GCPRO5 (prompt, dir, default_filename, mustmatch, file);
-  CHECK_STRING (prompt, 0);
+  CHECK_STRING (prompt);
-  CHECK_STRING (dir, 1);
+  CHECK_STRING (dir);
  /* Prevent redisplay.  */
  specbind (Qinhibit_redisplay, Qt);
diff --git a/src/xmenu.c b/src/xmenu.c
index e974dfe312c..4461b8aa538 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -619,10 +619,10 @@ list_of_panes (menu)
      Lisp_Object elt, pane_name, pane_data;
      elt = Fcar (tail);
      pane_name = Fcar (elt);
-      CHECK_STRING (pane_name, 0);
+      CHECK_STRING (pane_name);
      push_menu_pane (pane_name, Qnil);
      pane_data = Fcdr (elt);
-      CHECK_CONS (pane_data, 0);
+      CHECK_CONS (pane_data);
      list_of_items (pane_data);
    }
@@ -646,9 +646,9 @@ list_of_items (pane)
        push_left_right_boundary ();
      else
        {
-          CHECK_CONS (item, 0);
+          CHECK_CONS (item);
          item1 = Fcar (item);
-          CHECK_STRING (item1, 1);
+          CHECK_STRING (item1);
          push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil);
        }
    }
@@ -750,8 +750,8 @@ cached information about equivalent key sequences.  */)
            }
        }
-      CHECK_NUMBER (x, 0);
+      CHECK_NUMBER (x);
-      CHECK_NUMBER (y, 0);
+      CHECK_NUMBER (y);
      /* Decode where to put the menu.  */
@@ -763,7 +763,7 @@ cached information about equivalent key sequences.  */)
        }
      else if (WINDOWP (window))
        {
-          CHECK_LIVE_WINDOW (window, 0);
+          CHECK_LIVE_WINDOW (window);
          f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
          xpos = (FONT_WIDTH (FRAME_FONT (f))
@@ -774,7 +774,7 @@ cached information about equivalent key sequences.  */)
      else
        /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
           but I don't want to make one now.  */
-        CHECK_WINDOW (window, 0);
+        CHECK_WINDOW (window);
      xpos += XINT (x);
      ypos += XINT (y);
@@ -846,7 +846,7 @@ cached information about equivalent key sequences.  */)
    {
      /* We were given an old-fashioned menu.  */
      title = Fcar (menu);
-      CHECK_STRING (title, 1);
+      CHECK_STRING (title);
      list_of_panes (Fcdr (menu));
@@ -948,13 +948,13 @@ on the left of the dialog box and all following items on the right.
    f = XFRAME (window);
  else if (WINDOWP (window))
    {
-      CHECK_LIVE_WINDOW (window, 0);
+      CHECK_LIVE_WINDOW (window);
      f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
    }
  else
    /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
       but I don't want to make one now.  */
-    CHECK_WINDOW (window, 0);
+    CHECK_WINDOW (window);
 #ifndef USE_X_TOOLKIT
  /* Display a menu with these alternatives
@@ -977,7 +977,7 @@ on the left of the dialog box and all following items on the right.
    /* Decode the dialog items from what was specified.  */
    title = Fcar (contents);
-    CHECK_STRING (title, 1);
+    CHECK_STRING (title);
    list_of_panes (Fcons (contents, Qnil));
diff --git a/src/xselect.c b/src/xselect.c
index f2c1aa0a3e2..cc4eeed966e 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -304,7 +304,7 @@ x_own_selection (selection_name, selection_value)
  struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (sf);
  int count;
-  CHECK_SYMBOL (selection_name, 0);
+  CHECK_SYMBOL (selection_name);
  selection_atom = symbol_to_x_atom (dpyinfo, display, selection_name);
  BLOCK_INPUT;
@@ -415,7 +415,7 @@ x_get_local_selection (selection_symbol, target_type)
      count = specpdl_ptr - specpdl;
      specbind (Qinhibit_quit, Qt);
-      CHECK_SYMBOL (target_type, 0);
+      CHECK_SYMBOL (target_type);
      handler_fn = Fcdr (Fassq (target_type, Vselection_converter_alist));
      if (!NILP (handler_fn))
        value = call3 (handler_fn,
@@ -1173,12 +1173,12 @@ copy_multiple_data (obj)
  if (CONSP (obj))
    return Fcons (XCAR (obj), copy_multiple_data (XCDR (obj)));
    
-  CHECK_VECTOR (obj, 0);
+  CHECK_VECTOR (obj);
  vec = Fmake_vector (size = XVECTOR (obj)->size, Qnil);
  for (i = 0; i < size; i++)
    {
      Lisp_Object vec2 = XVECTOR (obj)->contents [i];
-      CHECK_VECTOR (vec2, 0);
+      CHECK_VECTOR (vec2);
      if (XVECTOR (vec2)->size != 2)
        /* ??? Confusing error message */
        Fsignal (Qerror, Fcons (build_string ("vectors must be of length 2"),
@@ -1958,7 +1958,7 @@ anything that the functions on `selection-converter-alist' know about.  */)
     Lisp_Object selection_name, selection_value;
 {
  check_x ();
-  CHECK_SYMBOL (selection_name, 0);
+  CHECK_SYMBOL (selection_name);
  if (NILP (selection_value)) error ("selection-value may not be nil");
  x_own_selection (selection_name, selection_value);
  return selection_value;
@@ -1982,19 +1982,19 @@ TYPE is the type of data desired, typically `STRING'.  */)
  struct gcpro gcpro1, gcpro2;
  GCPRO2 (target_type, val); /* we store newly consed data into these */
  check_x ();
-  CHECK_SYMBOL (selection_symbol, 0);
+  CHECK_SYMBOL (selection_symbol);
 #if 0 /* #### MULTIPLE doesn't work yet */
  if (CONSP (target_type)
      && XCAR (target_type) == QMULTIPLE)
    {
-      CHECK_VECTOR (XCDR (target_type), 0);
+      CHECK_VECTOR (XCDR (target_type));
      /* So we don't destructively modify this...  */
      target_type = copy_multiple_data (target_type);
    }
  else
 #endif
-    CHECK_SYMBOL (target_type, 0);
+    CHECK_SYMBOL (target_type);
  val = x_get_local_selection (selection_symbol, target_type);
@@ -2035,7 +2035,7 @@ Disowning it means there is no such selection.  */)
  check_x ();
  display = FRAME_X_DISPLAY (sf);
  dpyinfo = FRAME_X_DISPLAY_INFO (sf);
-  CHECK_SYMBOL (selection, 0);
+  CHECK_SYMBOL (selection);
  if (NILP (time))
    timestamp = last_event_timestamp;
  else
@@ -2096,7 +2096,7 @@ and t is the same as `SECONDARY'.  */)
     Lisp_Object selection;
 {
  check_x ();
-  CHECK_SYMBOL (selection, 0);
+  CHECK_SYMBOL (selection);
  if (EQ (selection, Qnil)) selection = QPRIMARY;
  if (EQ (selection, Qt)) selection = QSECONDARY;
  
@@ -2126,7 +2126,7 @@ and t is the same as `SECONDARY'.  */)
    return Qnil;
  dpy = FRAME_X_DISPLAY (sf);
-  CHECK_SYMBOL (selection, 0);
+  CHECK_SYMBOL (selection);
  if (!NILP (Fx_selection_owner_p (selection)))
    return Qt;
  if (EQ (selection, Qnil)) selection = QPRIMARY;
@@ -2166,8 +2166,8 @@ initialize_cut_buffers (display, window)
 }
-#define CHECK_CUT_BUFFER(symbol,n)                                      \
+#define CHECK_CUT_BUFFER(symbol)                                        \
-  { CHECK_SYMBOL ((symbol), (n));                                       \
+  { CHECK_SYMBOL ((symbol));                                    \
    if (!EQ((symbol), QCUT_BUFFER0) && !EQ((symbol), QCUT_BUFFER1)      \
        && !EQ((symbol), QCUT_BUFFER2) && !EQ((symbol), QCUT_BUFFER3)   \
        && !EQ((symbol), QCUT_BUFFER4) && !EQ((symbol), QCUT_BUFFER5)   \
@@ -2199,7 +2199,7 @@ DEFUN ("x-get-cut-buffer-internal", Fx_get_cut_buffer_internal,
  display = FRAME_X_DISPLAY (sf);
  dpyinfo = FRAME_X_DISPLAY_INFO (sf);
  window = RootWindow (display, 0); /* Cut buffers are on screen 0 */
-  CHECK_CUT_BUFFER (buffer, 0);
+  CHECK_CUT_BUFFER (buffer);
  buffer_atom = symbol_to_x_atom (dpyinfo, display, buffer);
  x_get_window_property (display, window, buffer_atom, &data, &bytes,
@@ -2244,8 +2244,8 @@ DEFUN ("x-store-cut-buffer-internal", Fx_store_cut_buffer_internal,
  if (max_bytes > MAX_SELECTION_QUANTUM)
    max_bytes = MAX_SELECTION_QUANTUM;
-  CHECK_CUT_BUFFER (buffer, 0);
+  CHECK_CUT_BUFFER (buffer);
-  CHECK_STRING (string, 0);
+  CHECK_STRING (string);
  buffer_atom = symbol_to_x_atom (FRAME_X_DISPLAY_INFO (sf),
                                  display, buffer);
  data = (unsigned char *) XSTRING (string)->data;
@@ -2297,7 +2297,7 @@ Positive means shift the values forward, negative means backward.  */)
  check_x ();
  display = FRAME_X_DISPLAY (sf);
  window = RootWindow (display, 0); /* Cut buffers are on screen 0 */
-  CHECK_NUMBER (n, 0);
+  CHECK_NUMBER (n);
  if (XINT (n) == 0)
    return n;
  if (! FRAME_X_DISPLAY_INFO (sf)->cut_buffers_initialized)
author	Pavel Janík	2001-11-02 20:46:55 +0000
committer	Pavel Janík	2001-11-02 20:46:55 +0000
commit	b78265036088d5d0eac2a03b929adb50aa59b45c (patch)
tree	de99fe733144deb926fd31ee7bdff95cb1bc5073 /src
parent	00a2cef7d11a1b193891eb3d28274ef7fc7c3fe4 (diff)
download	emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.tar.gz emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.zip