--- a/src/ls-oct-ascii.cc
+++ b/src/ls-oct-ascii.cc
@@ -51,6 +51,8 @@
 #include "error.h"
 #include "gripes.h"
 #include "load-save.h"
+#include "ls-ascii-helper.h"
+#include "ls-oct-ascii.h"
 #include "oct-obj.h"
 #include "oct-map.h"
 #include "ov-cell.h"
@@ -62,8 +64,6 @@
 #include "version.h"
 #include "dMatrix.h"
 
-#include "ls-oct-ascii.h"
-
 // The number of decimal digits to use when writing ascii data.
 static int Vsave_precision = 16;
 
@@ -123,10 +123,7 @@
 	  else if (next_only)
 	    break;
 	  else
-	    {
-	      while (is.get (c) && c != '\n' && c != '\r')
-		; // Skip to end of line.
-	    }
+	    skip_until_newline (is, false);
 	}
     }