diff --git a/src/chars.c b/src/chars.c
index 09b2b9b1352ba4936cdaf64a725cd0fe2aeb1985..2000b78f5caa794f2404c36e38a6e0770f4e9052 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -553,7 +553,7 @@ int mbstrncasecmp(const char *s1, const char *s2, size_t n)
 }
 
 #ifndef HAVE_STRCASESTR
-/* This function (nstrcasestr(), originally mutt_stristr()) was adapted
+/* This function, nstrcasestr() (originally mutt_stristr()), was adapted
  * from mutt 1.2.4i (lib.c).  Here is the notice from that file:
  *
  * Copyright (C) 1996-2000 Michael R. Elkins <me@cs.hmc.edu>
diff --git a/src/files.c b/src/files.c
index b5ecd3fca1f2c2e7cc6871e21d1c7c649286f6df..08596445acc1a8efae1963e8d3bb5cd8a8b44a06 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1945,9 +1945,10 @@ int is_dir(const char *buf)
     return ret;
 }
 
-/* These functions (username_tab_completion(), cwd_tab_completion(), and
- * input_tab()) were adapted from busybox 0.46 (cmdedit.c).  Here is the
- * notice from that file:
+/* These functions, username_tab_completion(), cwd_tab_completion()
+ * (originally exe_n_cwd_tab_completion()), and input_tab(), were
+ * adapted from busybox 0.46 (cmdedit.c).  Here is the notice from that
+ * file:
  *
  * Termios command line History and Editting, originally
  * intended for NetBSD sh (ash)
@@ -1999,8 +2000,8 @@ char **username_tab_completion(const char *buf, size_t *num_matches,
     return matches;
 }
 
-/* This was originally called exe_n_cwd_tab_completion(), but we're not
- * worried about executables, only filenames :> */
+/* We consider the first buflen characters of buf for filename tab
+ * completion. */
 char **cwd_tab_completion(const char *buf, size_t *num_matches, size_t
 	buflen)
 {
diff --git a/src/utils.c b/src/utils.c
index 6c96f7939e86763644864b7138a8fd0fa8c5a894..36e447e2bcdfcd487b5f995a9091db5e31becd74 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -157,10 +157,10 @@ void sunder(char *str)
     }
 }
 
-/* These functions (ngetline() and ngetdelim(), originally getline() and
- * getdelim()) were adapted from GNU mailutils 0.5 (mailbox/getline.c).
- * Here is the notice from that file, after converting to the GPL via
- * LGPL clause 3:
+/* These functions, ngetline() (originally getline()) and ngetdelim()
+ * (originally getdelim()), were adapted from GNU mailutils 0.5
+ * (mailbox/getline.c).  Here is the notice from that file, after
+ * converting to the GPL via LGPL clause 3:
  *
  * GNU Mailutils -- a suite of utilities for electronic mail
  * Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.