diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 0a8dab25a..b4eced90c 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-07  Michael Livshin  <mlivshin@bigfoot.com>
+
+	* snarf-check-and-output-texi: print optional args in a prettier
+	manner.
+
 2001-08-01  Thien-Thi Nguyen  <ttn@revel.glug.org>
 
 	* PROGRAM, README, display-commentary, doc-snarf,
diff --git a/scripts/snarf-check-and-output-texi b/scripts/snarf-check-and-output-texi
index bc1287b38..a300ca78e 100755
--- a/scripts/snarf-check-and-output-texi
+++ b/scripts/snarf-check-and-output-texi
@@ -152,26 +152,25 @@ exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
               (with-output-to-string
                 (lambda ()
                   (format #t "~A" *function-name*)
-                  (let loop-req ((r 0))
+                  (let loop-req ((args *args*) (r 0))
                     (if (< r req)
                       (begin
-                       (format #t " ~A" (list-ref *args* r))
-                       (loop-req (+ 1 r)))
-                      (begin
-                       (if (> opt 0)
-                         (format #t "~A[" (if (> req 0) " " "")))
-                       (let loop-opt ((o 0) (space #f))
-                         (if (< o opt)
-                           (begin
-                            (format #t "~A~A" (if space " " "")
-                                    (list-ref *args* (+ r o)))
-                            (loop-opt (+ 1 o) #t))
-                           (begin
-                            (if (> opt 0)
-                              (format #t "]"))
-                            (if (> var 0)
-                              (format #t " . ~A"
-                                      (car (last-pair *args*)))))))))))))))
+                       (format #t " ~A" (car args))
+                       (loop-req (cdr args) (+ 1 r)))
+                      (let loop-opt ((o 0) (args args) (tail '()))
+                       (if (< o opt)
+                         (begin
+                          (format #t " [~A" (car args))
+                          (loop-opt (+ 1 o) (cdr args) (cons #\] tail)))
+                         (begin
+                          (if (> var 0)
+                            (format #t " . ~A"
+                                    (car args)))
+                          (let loop-tail ((tail tail))
+                               (if (not (null? tail))
+                                 (begin
+                                  (format #t "~A" (car tail))
+                                  (loop-tail (cdr tail)))))))))))))))
       (format #t "\n~A\n" *function-name*)
       (format #t "@c snarfed from ~A:~A\n" *file* *line*)
       (format #t "@deffn primitive ~A\n" nice-sig)