diff --git a/scripts/PROGRAM b/scripts/PROGRAM
index ea0146f15..3511ccdfc 100755
--- a/scripts/PROGRAM
+++ b/scripts/PROGRAM
@@ -22,6 +22,8 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;; Boston, MA 02111-1307 USA
 
+;;; Author: J.R.Hacker
+
 ;;; Commentary:
 
 ;; Usage: PROGRAM [ARGS]
@@ -29,8 +31,6 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; PROGRAM does something.
 ;;
 ;; TODO: Write it!
-;;
-;; Author: J.R.Hacker
 
 ;;; Code:
 
diff --git a/scripts/display-commentary b/scripts/display-commentary
index 537ef2ca8..1eeb842d8 100755
--- a/scripts/display-commentary
+++ b/scripts/display-commentary
@@ -22,13 +22,13 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;; Boston, MA 02111-1307 USA
 
+;;; Author: Thien-Thi Nguyen
+
 ;;; Commentary:
 
 ;; Usage: display-commentary FILE1 FILE2 ...
 ;;
 ;; Display Commentary section from FILE1, FILE2 and so on.
-;;
-;; Author: Thien-Thi Nguyen
 
 ;;; Code:
 
diff --git a/scripts/doc-snarf b/scripts/doc-snarf
index ae417c0f2..941682e78 100755
--- a/scripts/doc-snarf
+++ b/scripts/doc-snarf
@@ -22,6 +22,8 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;; Boston, MA 02111-1307 USA
 
+;;; Author: Martin Grabmueller
+
 ;;; Commentary:
 
 ;; Usage: doc-snarf FILE
@@ -75,8 +77,6 @@ This procedure foos, or bars, depending on the argument @var{braz}.
 ;;       More parameterization.
 ;;       ../libguile/guile-doc-snarf emulation
 
-;;; Author: Martin Grabmueller
-
 (define doc-snarf-version "0.0.2") ; please update before publishing!
 
 ;;; Code:
diff --git a/scripts/generate-autoload b/scripts/generate-autoload
index 523b6049d..eef2b88c5 100755
--- a/scripts/generate-autoload
+++ b/scripts/generate-autoload
@@ -22,6 +22,8 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;; Boston, MA 02111-1307 USA
 
+;;; Author: Thien-Thi Nguyen
+
 ;;; Commentary:
 
 ;; Usage: generate-autoload [OPTIONS] FILE1 FILE2 ...
@@ -55,8 +57,6 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; (generate-autoload "generate-autoload")
 ;; (generate-autoload "--target" "(my module)" "generate-autoload")
 ;; (apply generate-autoload "--target" "(my module)" '("foo" "bar" "baz"))
-;;
-;; Author: Thien-Thi Nguyen
 
 ;;; Code:
 
diff --git a/scripts/punify b/scripts/punify
index e5b0f9d78..1cc318fb6 100755
--- a/scripts/punify
+++ b/scripts/punify
@@ -22,6 +22,8 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;; Boston, MA 02111-1307 USA
 
+;;; Author: Thien-Thi Nguyen
+
 ;;; Commentary:
 
 ;; Usage: punify FILE1 FILE2 ...
@@ -38,8 +40,6 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; TODO: Read from stdin.
 ;;       Handle vectors.
 ;;       Identifier punification.
-;;
-;; Author: Thien-Thi Nguyen
 
 ;;; Code:
 
diff --git a/scripts/read-scheme-source b/scripts/read-scheme-source
index 54cad4db0..48e96058a 100755
--- a/scripts/read-scheme-source
+++ b/scripts/read-scheme-source
@@ -22,6 +22,8 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;; Boston, MA 02111-1307 USA
 
+;;; Author: Thien-Thi Nguyen
+
 ;;; Commentary:
 
 ;; Usage: read-scheme-source FILE1 FILE2 ...
@@ -35,7 +37,7 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;;
 ;;    (quote (filename FILENAME))
 ;;
-;;    (quote (comment :leading-parens N
+;;    (quote (comment :leading-semicolons N
 ;;                    :text LINE))
 ;;
 ;;    (quote (whitespace :text LINE))
@@ -77,8 +79,6 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;;
 ;; TODO: Add option "--clump-comments", maybe w/ different clumping styles.
 ;;       Make `annotate!' extensible.
-;;
-;; Author: Thien-Thi Nguyen
 
 ;;; Code:
 
@@ -154,8 +154,9 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
                   ((regexp-exec all-comment-rx line)
                    => (lambda (m)
                         (nb! `'(comment
-                                :leading-parens ,(let ((m1 (vector-ref m 1)))
-                                                   (- (cdr m1) (car m1)))
+                                :leading-semicolons
+                                ,(let ((m1 (vector-ref m 1)))
+                                   (- (cdr m1) (car m1)))
                                 :text ,line))))
                   (else
                    (unread-string line p)
diff --git a/scripts/use2dot b/scripts/use2dot
index 1b59519ae..2f1b58d04 100755
--- a/scripts/use2dot
+++ b/scripts/use2dot
@@ -22,6 +22,8 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
 ;; Boston, MA 02111-1307 USA
 
+;;; Author: Thien-Thi Nguyen based on PERL script by Keisuke Nishida
+
 ;;; Commentary:
 
 ;; Usage: use2dot [OPTIONS] [FILE ...]
@@ -51,8 +53,6 @@ exec ${GUILE-guile} -c "(apply $main (cdr (command-line)))" "$@"
 ;; - add `--load-synonyms' option
 ;; - add `--ignore-module' option
 ;; - handle arbitrary command-line key/value configuration
-;;
-;; Author: Thien-Thi Nguyen based on PERL script by Keisuke Nishida
 
 ;;; Code: