diff --git a/src/builtins/string.cpp b/src/builtins/string.cpp
index e1d7a91a8..566826ec6 100644
--- a/src/builtins/string.cpp
+++ b/src/builtins/string.cpp
@@ -714,10 +714,8 @@ static int string_escape(parser_t &parser, io_streams_t &streams, int argc, cons
     int nesc = 0;
     arg_iterator_t aiter(argv, optind, streams);
     while (const wcstring *arg = aiter.nextstr()) {
-        streams.out.append(escape_string(*arg, flags, opts.escape_style));
-        if (aiter.want_newline()) {
-            streams.out.append(L'\n');
-        }
+        wcstring sep = aiter.want_newline() ? L"\n" : L"";
+        streams.out.append(escape_string(*arg, flags, opts.escape_style) + sep);
         nesc++;
     }
 
@@ -740,11 +738,9 @@ static int string_unescape(parser_t &parser, io_streams_t &streams, int argc,
     arg_iterator_t aiter(argv, optind, streams);
     while (const wcstring *arg = aiter.nextstr()) {
         wcstring result;
+        wcstring sep = aiter.want_newline() ? L"\n" : L"";
         if (unescape_string(*arg, &result, flags, opts.escape_style)) {
-            streams.out.append(result);
-            if (aiter.want_newline()) {
-                streams.out.append(L'\n');
-            }
+            streams.out.append(result + sep);
             nesc++;
         }
     }
@@ -822,8 +818,7 @@ static int string_length(parser_t &parser, io_streams_t &streams, int argc, cons
                     nnonempty++;
                 }
                 if (!opts.quiet) {
-                    streams.out.append(to_string(max));
-                    streams.out.append(L'\n');
+                    streams.out.append(to_string(max) + L"\n");
                 } else if (nnonempty > 0) {
                     return STATUS_CMD_OK;
                 }
@@ -834,8 +829,7 @@ static int string_length(parser_t &parser, io_streams_t &streams, int argc, cons
                 nnonempty++;
             }
             if (!opts.quiet) {
-                streams.out.append(to_string(n));
-                streams.out.append(L'\n');
+                streams.out.append(to_string(n) + L"\n");
             } else if (nnonempty > 0) {
                 return STATUS_CMD_OK;
             }
@@ -901,8 +895,7 @@ class wildcard_matcher_t final : public string_matcher_t {
                 if (opts.index) {
                     streams.out.append_format(L"1 %lu\n", arg.length());
                 } else {
-                    streams.out.append(arg);
-                    streams.out.append(L'\n');
+                    streams.out.append(arg + L"\n");
                 }
             }
         }
@@ -985,8 +978,7 @@ class regex_matcher_t final : public string_matcher_t {
                 if (opts.index) {
                     streams.out.append_format(L"1 %lu\n", arg.length());
                 } else {
-                    streams.out.append(arg);
-                    streams.out.push_back(L'\n');
+                    streams.out.append(arg + L"\n");
                 }
             }
 
@@ -996,8 +988,7 @@ class regex_matcher_t final : public string_matcher_t {
         }
 
         if (opts.entire && !opts.quiet) {
-            streams.out.append(arg);
-            streams.out.push_back(L'\n');
+            streams.out.append(arg + L"\n");
         }
 
         // If we have groups-only, we skip the first match, which is the full one.
@@ -1006,11 +997,10 @@ class regex_matcher_t final : public string_matcher_t {
             maybe_t<match_range_t> cg = this->regex_.group(match_data_, j);
             if (cg.has_value() && !opts.quiet) {
                 if (opts.index) {
-                    streams.out.append_format(L"%lu %lu", cg->begin + 1, cg->end - cg->begin);
+                    streams.out.append_format(L"%lu %lu\n", cg->begin + 1, cg->end - cg->begin);
                 } else {
-                    streams.out.append(arg.substr(cg->begin, cg->end - cg->begin));
+                    streams.out.append(arg.substr(cg->begin, cg->end - cg->begin) + L"\n");
                 }
-                streams.out.push_back(L'\n');
             }
         }
 
@@ -1287,10 +1277,8 @@ bool literal_replacer_t::replace_matches(const wcstring &arg, bool want_newline)
     }
 
     if (!opts.quiet && (!opts.filter || replacement_occurred)) {
-        streams.out.append(result);
-        if (want_newline) {
-            streams.out.append(L'\n');
-        }
+        wcstring sep = want_newline ? L"\n" : L"";
+        streams.out.append(result + sep);
     }
 
     return true;
@@ -1317,10 +1305,8 @@ bool regex_replacer_t::replace_matches(const wcstring &arg, bool want_newline) {
     } else {
         bool replacement_occurred = repl_count > 0;
         if (!opts.quiet && (!opts.filter || replacement_occurred)) {
-            streams.out.append(*result);
-            if (want_newline) {
-                streams.out.append(L'\n');
-            }
+            wcstring sep = want_newline ? L"\n" : L"";
+            streams.out.append(*result + sep);
         }
         total_replaced += repl_count;
     }
@@ -1618,6 +1604,7 @@ static int string_sub(parser_t &parser, io_streams_t &streams, int argc, const w
         using size_type = wcstring::size_type;
         size_type pos = 0;
         size_type count = wcstring::npos;
+        wcstring sep = aiter.want_newline() ? L"\n" : L"";
 
         if (opts.start > 0) {
             pos = static_cast<size_type>(opts.start - 1);
@@ -1647,10 +1634,7 @@ static int string_sub(parser_t &parser, io_streams_t &streams, int argc, const w
 
         // Note that std::string permits count to extend past end of string.
         if (!opts.quiet) {
-            streams.out.append(s->substr(pos, count));
-            if (aiter.want_newline()) {
-                streams.out.append(L'\n');
-            }
+            streams.out.append(s->substr(pos, count) + sep);
         }
         nsub++;
         if (opts.quiet) return STATUS_CMD_OK;
@@ -1760,8 +1744,7 @@ static int string_shorten(parser_t &parser, io_streams_t &streams, int argc, con
             }
 
             if (pos == 0) {
-                streams.out.append(line);
-                streams.out.append(L'\n');
+                streams.out.append(line + L"\n");
             } else {
                 // We have an ellipsis, construct our string and print it.
                 nsub++;
@@ -1804,8 +1787,7 @@ static int string_shorten(parser_t &parser, io_streams_t &streams, int argc, con
         }
 
         if (pos == line.size()) {
-            streams.out.append(line);
-            streams.out.append(L'\n');
+            streams.out.append(line + L"\n");
         } else {
             nsub++;
             wcstring newl = line.substr(0, pos);
@@ -1838,6 +1820,7 @@ static int string_trim(parser_t &parser, io_streams_t &streams, int argc, const
 
     arg_iterator_t aiter(argv, optind, streams);
     while (const wcstring *arg = aiter.nextstr()) {
+        wcstring sep = aiter.want_newline() ? L"\n" : L"";
         // Begin and end are respectively the first character to keep on the left, and first
         // character to trim on the right. The length is thus end - start.
         size_t begin = 0, end = arg->size();
@@ -1852,10 +1835,7 @@ static int string_trim(parser_t &parser, io_streams_t &streams, int argc, const
         assert(begin <= end && end <= arg->size());
         ntrim += arg->size() - (end - begin);
         if (!opts.quiet) {
-            streams.out.append(wcstring(*arg, begin, end - begin));
-            if (aiter.want_newline()) {
-                streams.out.append(L'\n');
-            }
+            streams.out.append(wcstring(*arg, begin, end - begin) + sep);
         } else if (ntrim > 0) {
             return STATUS_CMD_OK;
         }
@@ -1880,10 +1860,8 @@ static int string_transform(parser_t &parser, io_streams_t &streams, int argc, c
         std::transform(transformed.begin(), transformed.end(), transformed.begin(), func);
         if (transformed != *arg) n_transformed++;
         if (!opts.quiet) {
-            streams.out.append(transformed);
-            if (aiter.want_newline()) {
-                streams.out.append(L'\n');
-            }
+            wcstring sep = aiter.want_newline() ? L"\n" : L"";
+            streams.out.append(transformed + sep);
         } else if (n_transformed > 0) {
             return STATUS_CMD_OK;
         }