diff --git a/ChangeLog b/ChangeLog
index e3ee9c6b42f2e80f198d8837587d9b60ef161f6e..940f874d217f897626ab6005356b18740d4fcf67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,10 +89,10 @@ CVS code -
 	- When saving or changing file positions, be sure not to ignore
 	  placewewant.  Changes to do_int_spell_fix(), findnextstr(),
 	  do_replace_loop(), and do_replace(). (DLR)
-	- Convert current_x to a size_t, and convert some functions that
-	  use it as a parameter to use size_t as well.  Also change some
-	  current_x-related assertions to handle it. (David Benbennick
-	  and DLR)
+	- Convert current_x and mark_beginx to size_t's, and convert
+	  some functions that use them as a parameter to use size_t as
+	  well.  Also change some related assertions to handle them.
+	  (David Benbennick and DLR)
 - files.c:
   do_insertfile()
 	- Simplify by reusing variables whereever possible, and add a
diff --git a/src/global.c b/src/global.c
index e0ae62083a669460c23aa1a1402ceb1b4035890c..4713e45015b5e580d64172f4f31718a011375d18 100644
--- a/src/global.c
+++ b/src/global.c
@@ -113,7 +113,7 @@ char *help_text;		/* The text in the help window */
 
 #ifndef NANO_SMALL
 filestruct *mark_beginbuf;	/* The begin marker buffer */
-int mark_beginx;		/* X value in the string to start */
+size_t mark_beginx;		/* X value in the string to start */
 #endif
 
 #ifndef DISABLE_OPERATINGDIR
diff --git a/src/nano.c b/src/nano.c
index d6ee2865856566fbc464fbd1d4d65f2d93782e72..31e558a0ecccda5a1a76d12cd7b85aec83f76d03 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2365,7 +2365,7 @@ void do_justify(bool full_justify)
     filestruct *edittop_save = edittop, *current_save = current;
 #ifndef NANO_SMALL
     filestruct *mark_beginbuf_save = mark_beginbuf;
-    int mark_beginx_save = mark_beginx;
+    size_t mark_beginx_save = mark_beginx;
 #endif
     int kbinput;
     bool meta_key, func_key;
diff --git a/src/nano.h b/src/nano.h
index f50e8cedcca09caf6ef090b8267f4053dc827fa1..c5ec71fc646c8a60edbfd9d8f3c782fdb06ebcad 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -165,7 +165,7 @@ typedef struct openfilestruct {
     struct filestruct *file_mark_beginbuf;
 				/* Current file's beginning marked
 				 * line. */
-    int file_mark_beginx;	/* Current file's beginning marked
+    size_t file_mark_beginx;	/* Current file's beginning marked
 				 * line's x-coordinate position. */
 #endif
     size_t file_current_x;	/* Current file's x-coordinate
diff --git a/src/proto.h b/src/proto.h
index cf0719e677f05f6bbdbb4b57165bbc0cbd7f8ba2..b290673a7943f2f07dd8f3c5ca82d515d9cb5b4b 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -37,7 +37,7 @@ extern int current_y;
 extern int totlines;
 extern size_t placewewant;
 #ifndef NANO_SMALL
-extern int mark_beginx;
+extern size_t mark_beginx;
 #endif
 extern long totsize;
 extern long flags;
diff --git a/src/search.c b/src/search.c
index 0c9b6c0b3adf7b9f1641000b452f30fbebc37f73..6e8d268efdd34f0739facf7933fa7b69c79d00c8 100644
--- a/src/search.c
+++ b/src/search.c
@@ -745,7 +745,7 @@ ssize_t do_replace_loop(const char *needle, filestruct *real_current,
 
 	if (i > 0 || replaceall) {	/* Yes, replace it!!!! */
 	    char *copy;
-	    ssize_t length_change;
+	    size_t length_change;
 
 	    if (i == 2)
 		replaceall = TRUE;
@@ -763,7 +763,6 @@ ssize_t do_replace_loop(const char *needle, filestruct *real_current,
 	    }
 #endif
 
-	    assert(0 <= match_len + length_change);
 	    if (current == real_current && current_x <= *real_current_x) {
 		if (*real_current_x < current_x + match_len)
 		    *real_current_x = current_x + match_len;