3 files changed, 9 insertions, 9 deletions

diff --git a/src/fileio.c b/src/fileio.c
index 61e10dac47f..ed1d2aedf37 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5852,7 +5852,7 @@ A non-nil CURRENT-ONLY argument means save only current buffer.  */)
                    spare the user annoying messages.  */
                 && XFIXNUM (BVAR (b, save_length)) > 5000
                 && (growth_factor * (BUF_Z (b) - BUF_BEG (b))
-                    < (growth_factor - 1) * XFIXNAT (BVAR (b, save_length)))
+                    < (growth_factor - 1) * XFIXNUM (BVAR (b, save_length)))
                 /* These messages are frequent and annoying for `*mail*'.  */
                 && !NILP (BVAR (b, filename))
                 && NILP (no_message))
diff --git a/src/image.c b/src/image.c
index bbf25b4d58f..f3d6508f460 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2385,18 +2385,18 @@ lookup_image (struct frame *f, Lisp_Object spec)
 #endif
 
           ascent = image_spec_value (spec, QCascent, NULL);
-          if (RANGED_FIXNUMP (0, ascent, INT_MAX))
-            img->ascent = XFIXNAT (ascent);
+          if (FIXNUMP (ascent))
+            img->ascent = XFIXNUM (ascent);
           else if (EQ (ascent, Qcenter))
             img->ascent = CENTERED_IMAGE_ASCENT;
 
           margin = image_spec_value (spec, QCmargin, NULL);
-          if (RANGED_FIXNUMP (0, margin, INT_MAX))
-            img->vmargin = img->hmargin = XFIXNAT (margin);
+          if (FIXNUMP (margin))
+            img->vmargin = img->hmargin = XFIXNUM (margin);
           else if (CONSP (margin))
             {
-              img->hmargin = XFIXNAT (XCAR (margin));
-              img->vmargin = XFIXNAT (XCDR (margin));
+              img->hmargin = XFIXNUM (XCAR (margin));
+              img->vmargin = XFIXNUM (XCDR (margin));
             }
 
           relief = image_spec_value (spec, QCrelief, NULL);
diff --git a/src/textprop.c b/src/textprop.c
index 3026ec7e992..9023f4efa06 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -799,10 +799,10 @@ last valid position in OBJECT.  */)
       else
         CHECK_FIXNUM_COERCE_MARKER (limit);
 
-      if (XFIXNAT (position) >= XFIXNUM (limit))
+      if (XFIXNUM (position) >= XFIXNUM (limit))
         {
           position = limit;
-          if (XFIXNAT (position) > ZV)
+          if (XFIXNUM (position) > ZV)
             XSETFASTINT (position, ZV);
         }
       else