diff --git a/src/foreign/foreign.c b/src/foreign/foreign.c
index aef77a345e..1e8faa6658 100644
--- a/src/foreign/foreign.c
+++ b/src/foreign/foreign.c
@@ -2762,9 +2762,9 @@ static void save_errno_values(int kind)
 
   if (kind == 2) {
     long v = 0;
-#ifdef WINDOWS_DYNAMIC_LOAD
-v = GetLastError();
-#endif /* WINDOWS_DYNAMIC_LOAD */
+#   ifdef WINDOWS_DYNAMIC_LOAD
+    v = GetLastError();
+#   endif /* WINDOWS_DYNAMIC_LOAD */
     p->saved_errno = v;
     return;
   }
@@ -2786,11 +2786,11 @@ static Scheme_Object *foreign_lookup_errno(int argc, Scheme_Object *argv[])
   Scheme_Object *v = argv[0];
   if (SCHEME_SYMBOLP(v) && !SCHEME_SYM_WEIRDP(v)) {
     if (!strcmp("EINTR", SCHEME_SYM_VAL(v)))
-    return scheme_make_integer(EINTR);
-  if (!strcmp("EEXIST", SCHEME_SYM_VAL(v)))
-    return scheme_make_integer(EEXIST);
-  if (!strcmp("EAGAIN", SCHEME_SYM_VAL(v)))
-    return scheme_make_integer(EAGAIN);
+      return scheme_make_integer(EINTR);
+    if (!strcmp("EEXIST", SCHEME_SYM_VAL(v)))
+      return scheme_make_integer(EEXIST);
+    if (!strcmp("EAGAIN", SCHEME_SYM_VAL(v)))
+      return scheme_make_integer(EAGAIN);
   }
   scheme_wrong_type(MYNAME, "'EINTR, 'EEXIST, or 'EAGAIN",0, argc, argv);
   return NULL;
diff --git a/src/foreign/foreign.ssc b/src/foreign/foreign.ssc
index 54c0041589..cb2da8b6b4 100755
--- a/src/foreign/foreign.ssc
+++ b/src/foreign/foreign.ssc
@@ -5,8 +5,7 @@ exec mzscheme "$0" > `echo "$0" | sed 's/ssc$/c/'` "$0"
 
 #lang scribble/text
 
-@(require "ssc-utils.ss"
-          scheme/string)
+@(require "ssc-utils.ss")
 
 @header{foreign.ssc}
 
@@ -2123,7 +2122,7 @@ static void save_errno_values(int kind)
 
   if (kind == 2) {
     long v = 0;
-@@IFDEF{WINDOWS_DYNAMIC_LOAD}{
+    @@IFDEF{WINDOWS_DYNAMIC_LOAD}{
       v = GetLastError();
     }
     p->saved_errno = v;
@@ -2145,15 +2144,14 @@ static void save_errno_values(int kind)
                   (if (null? (cdr errnos))   
                       (format "or '~a" (car errnos))
                       (format "'~a, ~a" (car errnos) (loop (cdr errnos)))))])
-    @string-append{
+    @list{
       if (SCHEME_SYMBOLP(v) && !SCHEME_SYM_WEIRDP(v)) {
-        @(string-join
+        @(add-newlines
           (for/list ([e errnos])
-           @string-append{
-            if (!strcmp("@symbol->string[e]", SCHEME_SYM_VAL(v)))
-              return scheme_make_integer(@symbol->string[e]);
-           })
-          "\n")
+            @string-append{
+              if (!strcmp("@symbol->string[e]", SCHEME_SYM_VAL(v)))
+                return scheme_make_integer(@symbol->string[e]);
+            }))
       }
       scheme_wrong_type(MYNAME, "@syms",0, argc, argv);
       return NULL;
diff --git a/src/foreign/ssc-utils.ss b/src/foreign/ssc-utils.ss
index 395b584e86..a9ff72c8ae 100644
--- a/src/foreign/ssc-utils.ss
+++ b/src/foreign/ssc-utils.ss
@@ -7,11 +7,12 @@
 (provide maplines)
 (define (maplines #:semicolons? [semi? #t] fun . ls)
   (add-between
-   (apply filter-map (lambda xs
-                       (let ([r (apply fun xs)])
-                         (cond [(list? r) (if semi? (append r '(";")) r)]
-                               [(or (not r) (void? r)) #f]
-                               [else (error 'maplines "bad result: ~e" r)])))
+   (apply filter-map
+          (lambda xs
+            (let ([r (apply fun xs)])
+              (cond [(list? r) (if semi? (append r '(";")) r)]
+                    [(or (not r) (void? r)) #f]
+                    [else (error 'maplines "bad result: ~e" r)])))
           ls)
    "\n"))