From 51b3e20ebcf5f5b598ea33a6d1d393ffa5990430 Mon Sep 17 00:00:00 2001
From: Freddy Vulto <fvulto@gmail.com>
Date: Fri, 18 Jun 2010 17:21:38 +0200
Subject: [PATCH] (testsuite) Drop ending block comments Instead of writing `};
 # if', write just `}' as was discussed here:

    http://www.mail-archive.com/bash-completion-devel@lists.alioth.debian.org/msg01815.html
---
 test/config/default.exp                       |  16 +-
 test/lib/completions/a2ps.exp                 |   4 +-
 test/lib/completions/abook.exp                |   4 +-
 test/lib/completions/acroread.exp             |   4 +-
 test/lib/completions/add_members.exp          |   4 +-
 test/lib/completions/alias.exp                |   6 +-
 test/lib/completions/animate.exp              |   4 +-
 test/lib/completions/ant.exp                  |   4 +-
 test/lib/completions/apache2ctl.exp           |   4 +-
 test/lib/completions/apt-build.exp            |   4 +-
 test/lib/completions/apt-cache.exp            |   4 +-
 test/lib/completions/apt-get.exp              |   4 +-
 test/lib/completions/aptitude.exp             |   4 +-
 test/lib/completions/arch.exp                 |   4 +-
 test/lib/completions/arpspoof.exp             |   4 +-
 test/lib/completions/aspell.exp               |   4 +-
 test/lib/completions/autoconf.exp             |   4 +-
 test/lib/completions/automake.exp             |   4 +-
 test/lib/completions/autorpm.exp              |   4 +-
 test/lib/completions/awk.exp                  |   4 +-
 test/lib/completions/bash.exp                 |   4 +-
 test/lib/completions/bc.exp                   |   4 +-
 test/lib/completions/bison.exp                |   4 +-
 test/lib/completions/bk.exp                   |   4 +-
 test/lib/completions/brctl.exp                |   4 +-
 test/lib/completions/btdownloadcurses.py.exp  |   4 +-
 test/lib/completions/btdownloadgui.py.exp     |   4 +-
 .../lib/completions/btdownloadheadless.py.exp |   4 +-
 test/lib/completions/bzip2.exp                |   4 +-
 test/lib/completions/c++.exp                  |   4 +-
 test/lib/completions/cancel.exp               |   6 +-
 test/lib/completions/cardctl.exp              |   4 +-
 test/lib/completions/cat.exp                  |   4 +-
 test/lib/completions/cc.exp                   |   4 +-
 test/lib/completions/cd.exp                   |   6 +-
 test/lib/completions/cdrecord.exp             |   4 +-
 test/lib/completions/change_pw.exp            |   4 +-
 test/lib/completions/check_db.exp             |   4 +-
 test/lib/completions/check_perms.exp          |   4 +-
 test/lib/completions/chgrp.exp                |   4 +-
 test/lib/completions/chkconfig.exp            |   4 +-
 test/lib/completions/chown.exp                |   4 +-
 test/lib/completions/chsh.exp                 |   4 +-
 test/lib/completions/ci.exp                   |   4 +-
 test/lib/completions/civclient.exp            |   4 +-
 test/lib/completions/civserver.exp            |   4 +-
 test/lib/completions/cksfv.exp                |   4 +-
 test/lib/completions/cleanarch.exp            |   4 +-
 test/lib/completions/clisp.exp                |   4 +-
 test/lib/completions/clone_member.exp         |   4 +-
 test/lib/completions/co.exp                   |   4 +-
 test/lib/completions/composite.exp            |   4 +-
 test/lib/completions/config_list.exp          |   4 +-
 test/lib/completions/configure.exp            |   4 +-
 test/lib/completions/convert.exp              |   4 +-
 test/lib/completions/cowsay.exp               |   4 +-
 test/lib/completions/cp.exp                   |   4 +-
 test/lib/completions/cpio.exp                 |   4 +-
 test/lib/completions/createdb.exp             |   4 +-
 test/lib/completions/crontab.exp              |   4 +-
 test/lib/completions/cryptsetup.exp           |   4 +-
 test/lib/completions/csplit.exp               |   4 +-
 test/lib/completions/cut.exp                  |   4 +-
 test/lib/completions/cvs.exp                  |   6 +-
 test/lib/completions/cvsps.exp                |   6 +-
 test/lib/completions/date.exp                 |   4 +-
 test/lib/completions/dcop.exp                 |   6 +-
 test/lib/completions/dd.exp                   |   6 +-
 test/lib/completions/df.exp                   |   4 +-
 test/lib/completions/dhclient.exp             |   4 +-
 test/lib/completions/dict.exp                 |   4 +-
 test/lib/completions/diff.exp                 |   4 +-
 test/lib/completions/dir.exp                  |   4 +-
 test/lib/completions/display.exp              |   4 +-
 test/lib/completions/dnsspoof.exp             |   4 +-
 test/lib/completions/dpkg-deb.exp             |   4 +-
 test/lib/completions/dpkg-reconfigure.exp     |   4 +-
 test/lib/completions/dpkg-source.exp          |   4 +-
 test/lib/completions/dpkg.exp                 |   6 +-
 test/lib/completions/dropdb.exp               |   4 +-
 test/lib/completions/dselect.exp              |   4 +-
 test/lib/completions/dsniff.exp               |   4 +-
 test/lib/completions/du.exp                   |   4 +-
 test/lib/completions/dumpdb.exp               |   4 +-
 test/lib/completions/enscript.exp             |   4 +-
 test/lib/completions/env.exp                  |   6 +-
 test/lib/completions/evince.exp               |   4 +-
 test/lib/completions/expand.exp               |   6 +-
 test/lib/completions/filesnarf.exp            |   4 +-
 test/lib/completions/find.exp                 |  10 +-
 test/lib/completions/find_member.exp          |   4 +-
 test/lib/completions/finger.exp               |  12 +-
 test/lib/completions/fmt.exp                  |   6 +-
 test/lib/completions/fold.exp                 |   6 +-
 test/lib/completions/g++.exp                  |   4 +-
 test/lib/completions/g4.exp                   |   4 +-
 test/lib/completions/g77.exp                  |   4 +-
 test/lib/completions/gcc.exp                  |   4 +-
 test/lib/completions/gcj.exp                  |   4 +-
 test/lib/completions/gcl.exp                  |   4 +-
 test/lib/completions/gdb.exp                  |   4 +-
 test/lib/completions/genaliases.exp           |   4 +-
 test/lib/completions/getent.exp               |   4 +-
 test/lib/completions/gkrellm.exp              |   4 +-
 test/lib/completions/gmplayer.exp             |   4 +-
 test/lib/completions/gnatmake.exp             |   4 +-
 test/lib/completions/gpc.exp                  |   4 +-
 test/lib/completions/gperf.exp                |   4 +-
 test/lib/completions/gpg.exp                  |   4 +-
 test/lib/completions/gprof.exp                |   6 +-
 test/lib/completions/grep.exp                 |   4 +-
 test/lib/completions/grub.exp                 |   4 +-
 test/lib/completions/gzip.exp                 |   6 +-
 test/lib/completions/hcitool.exp              |   4 +-
 test/lib/completions/head.exp                 |   6 +-
 test/lib/completions/hping2.exp               |   4 +-
 test/lib/completions/iconv.exp                |   4 +-
 test/lib/completions/id.exp                   |   4 +-
 test/lib/completions/identify.exp             |   4 +-
 test/lib/completions/ifdown.exp               |   4 +-
 test/lib/completions/ifup.exp                 |   4 +-
 test/lib/completions/indent.exp               |   4 +-
 test/lib/completions/info.exp                 |   4 +-
 test/lib/completions/inject.exp               |   4 +-
 test/lib/completions/insmod.exp               |   4 +-
 test/lib/completions/invoke-rc.d.exp          |   4 +-
 test/lib/completions/ipsec.exp                |   4 +-
 test/lib/completions/ipv6calc.exp             |   4 +-
 test/lib/completions/irb.exp                  |   4 +-
 test/lib/completions/isql.exp                 |   4 +-
 test/lib/completions/iwconfig.exp             |   4 +-
 test/lib/completions/iwlist.exp               |   4 +-
 test/lib/completions/iwpriv.exp               |   4 +-
 test/lib/completions/iwspy.exp                |   4 +-
 test/lib/completions/jar.exp                  |   4 +-
 test/lib/completions/jarsigner.exp            |   4 +-
 test/lib/completions/java.exp                 |   4 +-
 test/lib/completions/javac.exp                |   4 +-
 test/lib/completions/javadoc.exp              |   4 +-
 test/lib/completions/k3b.exp                  |   4 +-
 test/lib/completions/kdvi.exp                 |   4 +-
 test/lib/completions/kill.exp                 |   4 +-
 test/lib/completions/killall.exp              |   4 +-
 test/lib/completions/kldload.exp              |   4 +-
 test/lib/completions/kldunload.exp            |   4 +-
 test/lib/completions/kpdf.exp                 |   4 +-
 test/lib/completions/kplayer.exp              |   4 +-
 test/lib/completions/larch.exp                |   4 +-
 test/lib/completions/ld.exp                   |   4 +-
 test/lib/completions/ldd.exp                  |   4 +-
 test/lib/completions/less.exp                 |   4 +-
 test/lib/completions/lftp.exp                 |   4 +-
 test/lib/completions/lftpget.exp              |   4 +-
 test/lib/completions/lilo.exp                 |   4 +-
 test/lib/completions/links.exp                |   4 +-
 test/lib/completions/lisp.exp                 |   4 +-
 test/lib/completions/list_admins.exp          |   4 +-
 test/lib/completions/list_lists.exp           |   4 +-
 test/lib/completions/list_members.exp         |   4 +-
 test/lib/completions/list_owners.exp          |   4 +-
 test/lib/completions/ln.exp                   |   4 +-
 test/lib/completions/look.exp                 |   6 +-
 test/lib/completions/ls.exp                   |   6 +-
 test/lib/completions/lvchange.exp             |   4 +-
 test/lib/completions/lvcreate.exp             |   4 +-
 test/lib/completions/lvdisplay.exp            |   4 +-
 test/lib/completions/lvextend.exp             |   4 +-
 test/lib/completions/lvm.exp                  |   4 +-
 test/lib/completions/lvmdiskscan.exp          |   4 +-
 test/lib/completions/lvreduce.exp             |   4 +-
 test/lib/completions/lvremove.exp             |   4 +-
 test/lib/completions/lvrename.exp             |   4 +-
 test/lib/completions/lvresize.exp             |   4 +-
 test/lib/completions/lvs.exp                  |   4 +-
 test/lib/completions/lvscan.exp               |   4 +-
 test/lib/completions/lzma.exp                 |   4 +-
 test/lib/completions/lzop.exp                 |   4 +-
 test/lib/completions/m4.exp                   |   6 +-
 test/lib/completions/macof.exp                |   4 +-
 test/lib/completions/mailmanctl.exp           |   4 +-
 test/lib/completions/mailsnarf.exp            |   4 +-
 test/lib/completions/make.exp                 |   4 +-
 test/lib/completions/man.exp                  |   4 +-
 test/lib/completions/mc.exp                   |   4 +-
 test/lib/completions/mcrypt.exp               |   4 +-
 test/lib/completions/md5sum.exp               |   4 +-
 test/lib/completions/mdecrypt.exp             |   4 +-
 test/lib/completions/mencoder.exp             |   4 +-
 test/lib/completions/minicom.exp              |   4 +-
 test/lib/completions/mkdir.exp                |   4 +-
 test/lib/completions/mkfifo.exp               |   4 +-
 test/lib/completions/mkinitrd.exp             |   4 +-
 test/lib/completions/mkisofs.exp              |   8 +-
 test/lib/completions/mknod.exp                |   4 +-
 test/lib/completions/mmsitepass.exp           |   4 +-
 test/lib/completions/module.exp               |   4 +-
 test/lib/completions/mogrify.exp              |   4 +-
 test/lib/completions/montage.exp              |   4 +-
 test/lib/completions/mplayer.exp              |   4 +-
 test/lib/completions/msgsnarf.exp             |   4 +-
 test/lib/completions/mtx.exp                  |   4 +-
 test/lib/completions/mutt.exp                 |   4 +-
 test/lib/completions/muttng.exp               |   4 +-
 test/lib/completions/mv.exp                   |   4 +-
 test/lib/completions/mysqladmin.exp           |   4 +-
 test/lib/completions/ncftp.exp                |   4 +-
 test/lib/completions/netstat.exp              |   4 +-
 test/lib/completions/newlist.exp              |   4 +-
 test/lib/completions/nl.exp                   |   4 +-
 test/lib/completions/nm.exp                   |   4 +-
 test/lib/completions/ntpdate.exp              |   4 +-
 test/lib/completions/objcopy.exp              |   4 +-
 test/lib/completions/objdump.exp              |   4 +-
 test/lib/completions/od.exp                   |   4 +-
 test/lib/completions/openssl.exp              |   6 +-
 test/lib/completions/p4.exp                   |   4 +-
 test/lib/completions/pack200.exp              |   4 +-
 test/lib/completions/paste.exp                |   4 +-
 test/lib/completions/patch.exp                |   4 +-
 test/lib/completions/perl.exp                 |   4 +-
 test/lib/completions/perldoc.exp              |   6 +-
 test/lib/completions/pgrep.exp                |   4 +-
 test/lib/completions/pine.exp                 |   4 +-
 test/lib/completions/ping.exp                 |   4 +-
 test/lib/completions/pkg-config.exp           |   4 +-
 test/lib/completions/pkg_deinstall.exp        |   4 +-
 test/lib/completions/pkg_delete.exp           |   4 +-
 test/lib/completions/pkg_info.exp             |   4 +-
 test/lib/completions/pkill.exp                |   4 +-
 test/lib/completions/portinstall.exp          |   4 +-
 test/lib/completions/portupgrade.exp          |   4 +-
 test/lib/completions/povray.exp               |   4 +-
 test/lib/completions/pr.exp                   |   4 +-
 test/lib/completions/psql.exp                 |   4 +-
 test/lib/completions/ptx.exp                  |   4 +-
 test/lib/completions/pvchange.exp             |   4 +-
 test/lib/completions/pvcreate.exp             |   4 +-
 test/lib/completions/pvdisplay.exp            |   4 +-
 test/lib/completions/pvmove.exp               |   4 +-
 test/lib/completions/pvremove.exp             |   4 +-
 test/lib/completions/pvs.exp                  |   4 +-
 test/lib/completions/pvscan.exp               |   4 +-
 test/lib/completions/python.exp               |   4 +-
 test/lib/completions/qrunner.exp              |   4 +-
 test/lib/completions/querybts.exp             |   4 +-
 test/lib/completions/rcs.exp                  |   4 +-
 test/lib/completions/rcsdiff.exp              |   4 +-
 test/lib/completions/rdict.exp                |   4 +-
 test/lib/completions/readelf.exp              |   4 +-
 test/lib/completions/readonly.exp             |   4 +-
 test/lib/completions/remove_members.exp       |   4 +-
 test/lib/completions/removepkg.exp            |   4 +-
 test/lib/completions/renice.exp               |   8 +-
 test/lib/completions/reportbug.exp            |   4 +-
 test/lib/completions/ri.exp                   |   4 +-
 test/lib/completions/rlog.exp                 |   4 +-
 test/lib/completions/rm.exp                   |   4 +-
 test/lib/completions/rmdir.exp                |   4 +-
 test/lib/completions/rmlist.exp               |   4 +-
 test/lib/completions/rpcdebug.exp             |   4 +-
 test/lib/completions/rpm.exp                  |   6 +-
 test/lib/completions/rsync.exp                |   4 +-
 test/lib/completions/rtcwake.exp              |   4 +-
 test/lib/completions/sbcl-mt.exp              |   4 +-
 test/lib/completions/sbcl.exp                 |   4 +-
 test/lib/completions/scp.exp                  |  18 +-
 test/lib/completions/screen.exp               |   6 +-
 test/lib/completions/sed.exp                  |   6 +-
 test/lib/completions/seq.exp                  |   4 +-
 test/lib/completions/service.exp              |   4 +-
 test/lib/completions/set.exp                  |   4 +-
 test/lib/completions/sftp.exp                 |   8 +-
 test/lib/completions/sha1sum.exp              |   4 +-
 test/lib/completions/shar.exp                 |   4 +-
 test/lib/completions/sitecopy.exp             |   4 +-
 test/lib/completions/smartctl.exp             |   4 +-
 test/lib/completions/snownews.exp             |   4 +-
 test/lib/completions/sort.exp                 |   4 +-
 test/lib/completions/split.exp                |   6 +-
 test/lib/completions/spovray.exp              |   4 +-
 test/lib/completions/ssh.exp                  |  10 +-
 test/lib/completions/sshmitm.exp              |   4 +-
 test/lib/completions/sshow.exp                |   4 +-
 test/lib/completions/strace.exp               |   4 +-
 test/lib/completions/strip.exp                |   4 +-
 test/lib/completions/sudo.exp                 |   4 +-
 test/lib/completions/svk.exp                  |   4 +-
 test/lib/completions/svn.exp                  |   4 +-
 test/lib/completions/svnadmin.exp             |   4 +-
 test/lib/completions/svnlook.exp              |   4 +-
 test/lib/completions/sync_members.exp         |   4 +-
 test/lib/completions/sysctl.exp               |   6 +-
 test/lib/completions/tac.exp                  |   4 +-
 test/lib/completions/tail.exp                 |   6 +-
 test/lib/completions/tar.exp                  |   4 +-
 test/lib/completions/tcpkill.exp              |   4 +-
 test/lib/completions/tcpnice.exp              |   4 +-
 test/lib/completions/tee.exp                  |   4 +-
 test/lib/completions/texindex.exp             |   4 +-
 test/lib/completions/tightvncviewer.exp       |   4 +-
 test/lib/completions/time.exp                 |   4 +-
 test/lib/completions/touch.exp                |   6 +-
 test/lib/completions/tr.exp                   |   6 +-
 test/lib/completions/unace.exp                |   4 +-
 test/lib/completions/uname.exp                |   6 +-
 test/lib/completions/unexpand.exp             |   6 +-
 test/lib/completions/uniq.exp                 |   6 +-
 test/lib/completions/units.exp                |   6 +-
 test/lib/completions/unpack200.exp            |   4 +-
 test/lib/completions/unrar.exp                |   4 +-
 test/lib/completions/unset.exp                |   4 +-
 test/lib/completions/unshunt.exp              |   4 +-
 test/lib/completions/update-alternatives.exp  |   4 +-
 test/lib/completions/update-rc.d.exp          |   4 +-
 test/lib/completions/urlsnarf.exp             |   4 +-
 test/lib/completions/vdir.exp                 |   4 +-
 test/lib/completions/vgcfgbackup.exp          |   4 +-
 test/lib/completions/vgcfgrestore.exp         |   4 +-
 test/lib/completions/vgchange.exp             |   4 +-
 test/lib/completions/vgck.exp                 |   4 +-
 test/lib/completions/vgconvert.exp            |   4 +-
 test/lib/completions/vgcreate.exp             |   4 +-
 test/lib/completions/vgdisplay.exp            |   4 +-
 test/lib/completions/vgexport.exp             |   4 +-
 test/lib/completions/vgextend.exp             |   4 +-
 test/lib/completions/vgimport.exp             |   4 +-
 test/lib/completions/vgmerge.exp              |   4 +-
 test/lib/completions/vgmknodes.exp            |   4 +-
 test/lib/completions/vgreduce.exp             |   4 +-
 test/lib/completions/vgremove.exp             |   4 +-
 test/lib/completions/vgrename.exp             |   4 +-
 test/lib/completions/vgs.exp                  |   4 +-
 test/lib/completions/vgscan.exp               |   4 +-
 test/lib/completions/vgsplit.exp              |   4 +-
 test/lib/completions/vncviewer.exp            |   4 +-
 test/lib/completions/wc.exp                   |   6 +-
 test/lib/completions/webmitm.exp              |   4 +-
 test/lib/completions/wget.exp                 |   4 +-
 test/lib/completions/who.exp                  |   6 +-
 test/lib/completions/withlist.exp             |   4 +-
 test/lib/completions/wol.exp                  |   4 +-
 test/lib/completions/wtf.exp                  |   4 +-
 test/lib/completions/wvdial.exp               |   4 +-
 test/lib/completions/xhost.exp                |  22 +--
 test/lib/completions/xmllint.exp              |   4 +-
 test/lib/completions/xmlwf.exp                |   4 +-
 test/lib/completions/xmms.exp                 |   4 +-
 test/lib/completions/xpovray.exp              |   4 +-
 test/lib/completions/xrandr.exp               |   4 +-
 test/lib/completions/xsltproc.exp             |   4 +-
 test/lib/completions/xvnc4viewer.exp          |   4 +-
 test/lib/completions/xz.exp                   |   4 +-
 test/lib/completions/ypcat.exp                |   4 +-
 test/lib/completions/ypmatch.exp              |   4 +-
 test/lib/completions/yum-arch.exp             |   4 +-
 test/lib/completions/yum.exp                  |   4 +-
 test/lib/library.exp                          | 156 +++++++++---------
 test/unit/__expand_tilde_by_ref.exp           |   4 +-
 test/unit/_count_args.exp                     |   4 +-
 test/unit/_get_comp_words_by_ref.exp          |  30 ++--
 test/unit/_get_cword.exp                      |  30 ++--
 test/unit/_known_hosts_real.exp               |  10 +-
 test/unit/compgen.exp                         |   8 +-
 363 files changed, 904 insertions(+), 906 deletions(-)

diff --git a/test/config/default.exp b/test/config/default.exp
index d1c04e71..029f11d5 100644
--- a/test/config/default.exp
+++ b/test/config/default.exp
@@ -1,23 +1,23 @@
-    # Set default expect fallback routines
+# Set default expect fallback routines
 expect_after {
     eof {
         if {[info exists test]} {
             fail "$test at eof" 
         } else {
             fail "[info level 1] at eof" 
-        }; # if
-    }; # eof
+        }
+    }
     timeout {
         if {[info exists test]} {
             fail "$test at timeout" 
         } else {
             fail "[info level 1] at timeout" 
-        }; # if
-    }; # timeout
-}; # expect_after()
+        }
+    }
+}
 
 
-    # Call tool_start(), if available
+# Call tool_start(), if available
 if { [info procs "${tool}_start"] != "" } {
     ${tool}_start
-}; # if
+}
diff --git a/test/lib/completions/a2ps.exp b/test/lib/completions/a2ps.exp
index 796e14cc..77cd07f5 100644
--- a/test/lib/completions/a2ps.exp
+++ b/test/lib/completions/a2ps.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/abook.exp b/test/lib/completions/abook.exp
index 3f4e301f..43f62729 100644
--- a/test/lib/completions/abook.exp
+++ b/test/lib/completions/abook.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/acroread.exp b/test/lib/completions/acroread.exp
index 4f11f905..f1754e98 100644
--- a/test/lib/completions/acroread.exp
+++ b/test/lib/completions/acroread.exp
@@ -1,13 +1,13 @@
 proc setup {} {
     save_env
     assert_bash_exec "touch fixtures/shared/default/t.pdf";  # Create temporary files
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_bash_exec "rm fixtures/shared/default/t.pdf";  # Remove temporary files
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/add_members.exp b/test/lib/completions/add_members.exp
index 02cd762d..46c7a688 100644
--- a/test/lib/completions/add_members.exp
+++ b/test/lib/completions/add_members.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/alias.exp b/test/lib/completions/alias.exp
index e6b88d00..9dba4e62 100644
--- a/test/lib/completions/alias.exp
+++ b/test/lib/completions/alias.exp
@@ -3,13 +3,13 @@ proc setup {} {
     assert_bash_exec "alias foo=bar"
     assert_bash_exec "alias bar='foo foo'"
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_bash_exec "unalias -a";  # Remove all aliases
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -34,7 +34,7 @@ expect {
     -re "^alias foo\b\b\bfoo=foo\b\b\b$" { fail "$test: Wrong cursor position" }
     -re /@ { unresolved "$test" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/animate.exp b/test/lib/completions/animate.exp
index 26065d25..12314d79 100644
--- a/test/lib/completions/animate.exp
+++ b/test/lib/completions/animate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ant.exp b/test/lib/completions/ant.exp
index 81294439..de57f24a 100644
--- a/test/lib/completions/ant.exp
+++ b/test/lib/completions/ant.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/apache2ctl.exp b/test/lib/completions/apache2ctl.exp
index e63abb16..88e53fc2 100644
--- a/test/lib/completions/apache2ctl.exp
+++ b/test/lib/completions/apache2ctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/apt-build.exp b/test/lib/completions/apt-build.exp
index fd09d0eb..01ff04b4 100644
--- a/test/lib/completions/apt-build.exp
+++ b/test/lib/completions/apt-build.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/apt-cache.exp b/test/lib/completions/apt-cache.exp
index 5336beab..63be48a8 100644
--- a/test/lib/completions/apt-cache.exp
+++ b/test/lib/completions/apt-cache.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/apt-get.exp b/test/lib/completions/apt-get.exp
index 6bd0f3a2..66887bd0 100644
--- a/test/lib/completions/apt-get.exp
+++ b/test/lib/completions/apt-get.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/aptitude.exp b/test/lib/completions/aptitude.exp
index dde6d26e..e6e82abb 100644
--- a/test/lib/completions/aptitude.exp
+++ b/test/lib/completions/aptitude.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/arch.exp b/test/lib/completions/arch.exp
index 9f7114c4..0550c76b 100644
--- a/test/lib/completions/arch.exp
+++ b/test/lib/completions/arch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/arpspoof.exp b/test/lib/completions/arpspoof.exp
index 7db79f50..91ef5182 100644
--- a/test/lib/completions/arpspoof.exp
+++ b/test/lib/completions/arpspoof.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/aspell.exp b/test/lib/completions/aspell.exp
index 4edeb03b..9dd5f61a 100644
--- a/test/lib/completions/aspell.exp
+++ b/test/lib/completions/aspell.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/autoconf.exp b/test/lib/completions/autoconf.exp
index 4a44b651..53b096db 100644
--- a/test/lib/completions/autoconf.exp
+++ b/test/lib/completions/autoconf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/automake.exp b/test/lib/completions/automake.exp
index cf27364a..f875da56 100644
--- a/test/lib/completions/automake.exp
+++ b/test/lib/completions/automake.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/autorpm.exp b/test/lib/completions/autorpm.exp
index 99b743ca..2ae4ff80 100644
--- a/test/lib/completions/autorpm.exp
+++ b/test/lib/completions/autorpm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/awk.exp b/test/lib/completions/awk.exp
index 4288adbf..260dabcc 100644
--- a/test/lib/completions/awk.exp
+++ b/test/lib/completions/awk.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bash.exp b/test/lib/completions/bash.exp
index 4caf58fc..bf01e76d 100644
--- a/test/lib/completions/bash.exp
+++ b/test/lib/completions/bash.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bc.exp b/test/lib/completions/bc.exp
index c437d037..23c22b62 100644
--- a/test/lib/completions/bc.exp
+++ b/test/lib/completions/bc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bison.exp b/test/lib/completions/bison.exp
index a3dea1e0..4bbb59fa 100644
--- a/test/lib/completions/bison.exp
+++ b/test/lib/completions/bison.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bk.exp b/test/lib/completions/bk.exp
index 4915136e..b652e6b0 100644
--- a/test/lib/completions/bk.exp
+++ b/test/lib/completions/bk.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/brctl.exp b/test/lib/completions/brctl.exp
index d87002a2..57c9edff 100644
--- a/test/lib/completions/brctl.exp
+++ b/test/lib/completions/brctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/btdownloadcurses.py.exp b/test/lib/completions/btdownloadcurses.py.exp
index 9dc0ba5a..71a00de7 100644
--- a/test/lib/completions/btdownloadcurses.py.exp
+++ b/test/lib/completions/btdownloadcurses.py.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/btdownloadgui.py.exp b/test/lib/completions/btdownloadgui.py.exp
index 03897a53..65f56776 100644
--- a/test/lib/completions/btdownloadgui.py.exp
+++ b/test/lib/completions/btdownloadgui.py.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/btdownloadheadless.py.exp b/test/lib/completions/btdownloadheadless.py.exp
index 69c62950..3c833bb8 100644
--- a/test/lib/completions/btdownloadheadless.py.exp
+++ b/test/lib/completions/btdownloadheadless.py.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/bzip2.exp b/test/lib/completions/bzip2.exp
index e5389a2a..2813dd0e 100644
--- a/test/lib/completions/bzip2.exp
+++ b/test/lib/completions/bzip2.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/c++.exp b/test/lib/completions/c++.exp
index 1fe4bb13..4dffb042 100644
--- a/test/lib/completions/c++.exp
+++ b/test/lib/completions/c++.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cancel.exp b/test/lib/completions/cancel.exp
index 24ca47c4..fc2600ba 100644
--- a/test/lib/completions/cancel.exp
+++ b/test/lib/completions/cancel.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -22,7 +22,7 @@ if {[assert_exec {lp -H hold fixtures/shared/default/foo} job "" "untested"]} {
     assert_complete $jobs "cancel "
         # Remove/cancel the test print job
     assert_exec "cancel $job_id"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/cardctl.exp b/test/lib/completions/cardctl.exp
index b5d7e88d..9df90f48 100644
--- a/test/lib/completions/cardctl.exp
+++ b/test/lib/completions/cardctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cat.exp b/test/lib/completions/cat.exp
index 46e8775f..01b3659e 100644
--- a/test/lib/completions/cat.exp
+++ b/test/lib/completions/cat.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cc.exp b/test/lib/completions/cc.exp
index 1d63d006..eb722dea 100644
--- a/test/lib/completions/cc.exp
+++ b/test/lib/completions/cc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cd.exp b/test/lib/completions/cd.exp
index 58233575..2101f035 100644
--- a/test/lib/completions/cd.exp
+++ b/test/lib/completions/cd.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -29,7 +29,7 @@ expect {
 	-re "^cd fixtures/shared/default/foo\b\b\bfoo.d/foo\b\b\b$" { fail "$test: Wrong cursor position" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/cdrecord.exp b/test/lib/completions/cdrecord.exp
index d369f79d..192d2ded 100644
--- a/test/lib/completions/cdrecord.exp
+++ b/test/lib/completions/cdrecord.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/change_pw.exp b/test/lib/completions/change_pw.exp
index ca9bcdbd..28301941 100644
--- a/test/lib/completions/change_pw.exp
+++ b/test/lib/completions/change_pw.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/check_db.exp b/test/lib/completions/check_db.exp
index ca59a715..fe34ead2 100644
--- a/test/lib/completions/check_db.exp
+++ b/test/lib/completions/check_db.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/check_perms.exp b/test/lib/completions/check_perms.exp
index a58995b0..b40b78fc 100644
--- a/test/lib/completions/check_perms.exp
+++ b/test/lib/completions/check_perms.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/chgrp.exp b/test/lib/completions/chgrp.exp
index 8dfeea79..e9238bde 100644
--- a/test/lib/completions/chgrp.exp
+++ b/test/lib/completions/chgrp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/chkconfig.exp b/test/lib/completions/chkconfig.exp
index e7469b34..dae3b3bd 100644
--- a/test/lib/completions/chkconfig.exp
+++ b/test/lib/completions/chkconfig.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/chown.exp b/test/lib/completions/chown.exp
index 953b2b02..a758cc1d 100644
--- a/test/lib/completions/chown.exp
+++ b/test/lib/completions/chown.exp
@@ -1,10 +1,10 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/chsh.exp b/test/lib/completions/chsh.exp
index 99262a2c..a26ac93f 100644
--- a/test/lib/completions/chsh.exp
+++ b/test/lib/completions/chsh.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ci.exp b/test/lib/completions/ci.exp
index 09105eec..15ef2ecc 100644
--- a/test/lib/completions/ci.exp
+++ b/test/lib/completions/ci.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/civclient.exp b/test/lib/completions/civclient.exp
index 8159c2bc..c0047468 100644
--- a/test/lib/completions/civclient.exp
+++ b/test/lib/completions/civclient.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/civserver.exp b/test/lib/completions/civserver.exp
index df459688..3739f50e 100644
--- a/test/lib/completions/civserver.exp
+++ b/test/lib/completions/civserver.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cksfv.exp b/test/lib/completions/cksfv.exp
index a40a5023..2b9be04c 100644
--- a/test/lib/completions/cksfv.exp
+++ b/test/lib/completions/cksfv.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cleanarch.exp b/test/lib/completions/cleanarch.exp
index e3145e81..a5f3bfe6 100644
--- a/test/lib/completions/cleanarch.exp
+++ b/test/lib/completions/cleanarch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/clisp.exp b/test/lib/completions/clisp.exp
index 2bc599ac..dfbad4f3 100644
--- a/test/lib/completions/clisp.exp
+++ b/test/lib/completions/clisp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/clone_member.exp b/test/lib/completions/clone_member.exp
index 34b4db57..d83d73bc 100644
--- a/test/lib/completions/clone_member.exp
+++ b/test/lib/completions/clone_member.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/co.exp b/test/lib/completions/co.exp
index 49fe3a64..215268b6 100644
--- a/test/lib/completions/co.exp
+++ b/test/lib/completions/co.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/composite.exp b/test/lib/completions/composite.exp
index e39ce72f..aba9af3b 100644
--- a/test/lib/completions/composite.exp
+++ b/test/lib/completions/composite.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/config_list.exp b/test/lib/completions/config_list.exp
index 5246c860..27699239 100644
--- a/test/lib/completions/config_list.exp
+++ b/test/lib/completions/config_list.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/configure.exp b/test/lib/completions/configure.exp
index 74afba1b..b4399cb1 100644
--- a/test/lib/completions/configure.exp
+++ b/test/lib/completions/configure.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/convert.exp b/test/lib/completions/convert.exp
index d8a77e35..07032040 100644
--- a/test/lib/completions/convert.exp
+++ b/test/lib/completions/convert.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cowsay.exp b/test/lib/completions/cowsay.exp
index dfbefe1a..382f400f 100644
--- a/test/lib/completions/cowsay.exp
+++ b/test/lib/completions/cowsay.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cp.exp b/test/lib/completions/cp.exp
index 9fe46537..703bf263 100644
--- a/test/lib/completions/cp.exp
+++ b/test/lib/completions/cp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cpio.exp b/test/lib/completions/cpio.exp
index b02f2719..93f6f3c1 100644
--- a/test/lib/completions/cpio.exp
+++ b/test/lib/completions/cpio.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/createdb.exp b/test/lib/completions/createdb.exp
index 1e5cdbe7..aafff1b6 100644
--- a/test/lib/completions/createdb.exp
+++ b/test/lib/completions/createdb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/crontab.exp b/test/lib/completions/crontab.exp
index b7398e62..18e2269f 100644
--- a/test/lib/completions/crontab.exp
+++ b/test/lib/completions/crontab.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cryptsetup.exp b/test/lib/completions/cryptsetup.exp
index e94c3ac1..4c20bc5d 100644
--- a/test/lib/completions/cryptsetup.exp
+++ b/test/lib/completions/cryptsetup.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/csplit.exp b/test/lib/completions/csplit.exp
index 3a66a627..87b89dea 100644
--- a/test/lib/completions/csplit.exp
+++ b/test/lib/completions/csplit.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cut.exp b/test/lib/completions/cut.exp
index b9bcf6c5..edb558ea 100644
--- a/test/lib/completions/cut.exp
+++ b/test/lib/completions/cut.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/cvs.exp b/test/lib/completions/cvs.exp
index 2a26da8e..f6853946 100644
--- a/test/lib/completions/cvs.exp
+++ b/test/lib/completions/cvs.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     save_env
     assert_bash_exec {OLDHOME=$HOME ; HOME=$TESTDIR/fixtures/cvs}
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
     assert_env_unmodified {
         /OLDHOME=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -27,7 +27,7 @@ send "$cmd\t"
 expect {
     -re "^$cmd\r\n.*:pserver:.*\r\n/@$cmd:pserver:.*$" { pass "$test" }
     default { fail "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/cvsps.exp b/test/lib/completions/cvsps.exp
index 1fd4a0a9..def4a11b 100644
--- a/test/lib/completions/cvsps.exp
+++ b/test/lib/completions/cvsps.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     save_env
     assert_bash_exec {OLDHOME=$HOME ; HOME=$TESTDIR/fixtures/cvs}
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
     assert_env_unmodified {
         /OLDHOME=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -27,7 +27,7 @@ send "$cmd\t"
 expect {
     -re "^$cmd\r\n.*:pserver:.*\r\n/@$cmd:pserver:.*$" { pass "$test" }
     default { fail "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/date.exp b/test/lib/completions/date.exp
index 9d75f5f3..ee970cf7 100644
--- a/test/lib/completions/date.exp
+++ b/test/lib/completions/date.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dcop.exp b/test/lib/completions/dcop.exp
index 6ed800c5..1e27346b 100644
--- a/test/lib/completions/dcop.exp
+++ b/test/lib/completions/dcop.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {dcop} words]} {
     assert_complete $words "dcop "
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/dd.exp b/test/lib/completions/dd.exp
index 400dd143..e02e037c 100644
--- a/test/lib/completions/dd.exp
+++ b/test/lib/completions/dd.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -24,7 +24,7 @@ expect -ex "$cmd"
 expect {
     -re "^=$" { pass $test }
     -re {^\\=$} { xfail $test }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/df.exp b/test/lib/completions/df.exp
index 487d70a9..acf212a9 100644
--- a/test/lib/completions/df.exp
+++ b/test/lib/completions/df.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dhclient.exp b/test/lib/completions/dhclient.exp
index 42c14c82..6caff5fc 100644
--- a/test/lib/completions/dhclient.exp
+++ b/test/lib/completions/dhclient.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dict.exp b/test/lib/completions/dict.exp
index 32fb4988..402e0c5c 100644
--- a/test/lib/completions/dict.exp
+++ b/test/lib/completions/dict.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/diff.exp b/test/lib/completions/diff.exp
index c009f640..918bf7fd 100644
--- a/test/lib/completions/diff.exp
+++ b/test/lib/completions/diff.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dir.exp b/test/lib/completions/dir.exp
index 6e20d37d..c9f61cd5 100644
--- a/test/lib/completions/dir.exp
+++ b/test/lib/completions/dir.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/display.exp b/test/lib/completions/display.exp
index 9a9d6901..e9fe766a 100644
--- a/test/lib/completions/display.exp
+++ b/test/lib/completions/display.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dnsspoof.exp b/test/lib/completions/dnsspoof.exp
index 3223a349..4aefb956 100644
--- a/test/lib/completions/dnsspoof.exp
+++ b/test/lib/completions/dnsspoof.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dpkg-deb.exp b/test/lib/completions/dpkg-deb.exp
index c8656610..37ece08d 100644
--- a/test/lib/completions/dpkg-deb.exp
+++ b/test/lib/completions/dpkg-deb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dpkg-reconfigure.exp b/test/lib/completions/dpkg-reconfigure.exp
index 267594be..0212666b 100644
--- a/test/lib/completions/dpkg-reconfigure.exp
+++ b/test/lib/completions/dpkg-reconfigure.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dpkg-source.exp b/test/lib/completions/dpkg-source.exp
index a21eff45..a42759b9 100644
--- a/test/lib/completions/dpkg-source.exp
+++ b/test/lib/completions/dpkg-source.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dpkg.exp b/test/lib/completions/dpkg.exp
index 2bd1fb6e..f358e172 100644
--- a/test/lib/completions/dpkg.exp
+++ b/test/lib/completions/dpkg.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -20,7 +20,7 @@ sync_after_int
     # Build list of installed packages
 if {[assert_exec {dpkg --get-selections | command grep \[\[:space:\]\]install$ | cut -f1} packages]} {
     assert_complete $packages "dpkg -L "
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/dropdb.exp b/test/lib/completions/dropdb.exp
index e78a2ba7..8f2d5bfb 100644
--- a/test/lib/completions/dropdb.exp
+++ b/test/lib/completions/dropdb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dselect.exp b/test/lib/completions/dselect.exp
index f6257294..634db05e 100644
--- a/test/lib/completions/dselect.exp
+++ b/test/lib/completions/dselect.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dsniff.exp b/test/lib/completions/dsniff.exp
index a0cc43ac..cb8912b6 100644
--- a/test/lib/completions/dsniff.exp
+++ b/test/lib/completions/dsniff.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/du.exp b/test/lib/completions/du.exp
index d1ffa8ca..6ddeb9b2 100644
--- a/test/lib/completions/du.exp
+++ b/test/lib/completions/du.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/dumpdb.exp b/test/lib/completions/dumpdb.exp
index 240214b3..5b617b11 100644
--- a/test/lib/completions/dumpdb.exp
+++ b/test/lib/completions/dumpdb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/enscript.exp b/test/lib/completions/enscript.exp
index 7fefabdd..c859b50f 100644
--- a/test/lib/completions/enscript.exp
+++ b/test/lib/completions/enscript.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/env.exp b/test/lib/completions/env.exp
index f03f5395..4f213748 100644
--- a/test/lib/completions/env.exp
+++ b/test/lib/completions/env.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {env --help} "" "" "unsupported"]} {
     assert_complete_any "env --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/evince.exp b/test/lib/completions/evince.exp
index 22279a26..607c4428 100644
--- a/test/lib/completions/evince.exp
+++ b/test/lib/completions/evince.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/expand.exp b/test/lib/completions/expand.exp
index d5cd6b17..76b6eafa 100644
--- a/test/lib/completions/expand.exp
+++ b/test/lib/completions/expand.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {expand --help} "" "" "unsupported"]} {
     assert_complete_any "expand --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/filesnarf.exp b/test/lib/completions/filesnarf.exp
index 53cf01e4..03755056 100644
--- a/test/lib/completions/filesnarf.exp
+++ b/test/lib/completions/filesnarf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/find.exp b/test/lib/completions/find.exp
index 4b1728dc..aab08225 100644
--- a/test/lib/completions/find.exp
+++ b/test/lib/completions/find.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
@@ -50,28 +50,26 @@ sync_after_int
 
 
 set test "-uid should complete uids"
-    # Complete
 set cmd "find -uid "
 send "$cmd\t"
 expect {
     -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
 
 
 set test "-gid should complete gids"
-    # Complete
 set cmd "find -gid "
 send "$cmd\t"
 expect {
     -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/find_member.exp b/test/lib/completions/find_member.exp
index 58fac7d2..55672091 100644
--- a/test/lib/completions/find_member.exp
+++ b/test/lib/completions/find_member.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/finger.exp b/test/lib/completions/finger.exp
index 30f2b080..ae86a2d9 100644
--- a/test/lib/completions/finger.exp
+++ b/test/lib/completions/finger.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -16,7 +16,7 @@ set test "Tab should complete usernames"
 set users {}
 foreach u [exec bash -c "compgen -A user"] {
     lappend users $u
-}; # foreach
+}
 assert_complete $users "finger " $test
 
 
@@ -45,9 +45,9 @@ foreach h [get_known_hosts] {
         if {$first == $char && [lsearch -exact $hosts "test@$h"] == -1} {
             # Prefix hosts with username 'test@'
             lappend hosts "test@$h"
-        }; # if
-    }; # if
-}; # foreach
+        }
+    }
+}
 assert_complete $hosts "finger test@$char" $test
 
 
diff --git a/test/lib/completions/fmt.exp b/test/lib/completions/fmt.exp
index 28570682..7d3cc17f 100644
--- a/test/lib/completions/fmt.exp
+++ b/test/lib/completions/fmt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {fmt --help} "" "" "unsupported"]} {
     assert_complete_any "fmt -"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/fold.exp b/test/lib/completions/fold.exp
index a5230b03..f447f08b 100644
--- a/test/lib/completions/fold.exp
+++ b/test/lib/completions/fold.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {fold --help} "" "" "unsupported"]} {
     assert_complete_any "fold --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/g++.exp b/test/lib/completions/g++.exp
index 4dc2591a..4dbe73f4 100644
--- a/test/lib/completions/g++.exp
+++ b/test/lib/completions/g++.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/g4.exp b/test/lib/completions/g4.exp
index 203de061..7d575f10 100644
--- a/test/lib/completions/g4.exp
+++ b/test/lib/completions/g4.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/g77.exp b/test/lib/completions/g77.exp
index 8802aca9..e23745b7 100644
--- a/test/lib/completions/g77.exp
+++ b/test/lib/completions/g77.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gcc.exp b/test/lib/completions/gcc.exp
index 8e52a120..00097cc2 100644
--- a/test/lib/completions/gcc.exp
+++ b/test/lib/completions/gcc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gcj.exp b/test/lib/completions/gcj.exp
index db52d59a..cde07700 100644
--- a/test/lib/completions/gcj.exp
+++ b/test/lib/completions/gcj.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gcl.exp b/test/lib/completions/gcl.exp
index 7cead846..1846d0d1 100644
--- a/test/lib/completions/gcl.exp
+++ b/test/lib/completions/gcl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gdb.exp b/test/lib/completions/gdb.exp
index 982f0878..2e389edb 100644
--- a/test/lib/completions/gdb.exp
+++ b/test/lib/completions/gdb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/genaliases.exp b/test/lib/completions/genaliases.exp
index 064eb386..bb4d5e0e 100644
--- a/test/lib/completions/genaliases.exp
+++ b/test/lib/completions/genaliases.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/getent.exp b/test/lib/completions/getent.exp
index 121f3b38..6500b22d 100644
--- a/test/lib/completions/getent.exp
+++ b/test/lib/completions/getent.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gkrellm.exp b/test/lib/completions/gkrellm.exp
index f8b0dd4d..009770fc 100644
--- a/test/lib/completions/gkrellm.exp
+++ b/test/lib/completions/gkrellm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gmplayer.exp b/test/lib/completions/gmplayer.exp
index d9032698..a110cb2f 100644
--- a/test/lib/completions/gmplayer.exp
+++ b/test/lib/completions/gmplayer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gnatmake.exp b/test/lib/completions/gnatmake.exp
index 902aa062..bad4da33 100644
--- a/test/lib/completions/gnatmake.exp
+++ b/test/lib/completions/gnatmake.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gpc.exp b/test/lib/completions/gpc.exp
index 6c4d0383..71eddacc 100644
--- a/test/lib/completions/gpc.exp
+++ b/test/lib/completions/gpc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gperf.exp b/test/lib/completions/gperf.exp
index aa24333e..1cf77678 100644
--- a/test/lib/completions/gperf.exp
+++ b/test/lib/completions/gperf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gpg.exp b/test/lib/completions/gpg.exp
index 29fd2244..ea6805fa 100644
--- a/test/lib/completions/gpg.exp
+++ b/test/lib/completions/gpg.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gprof.exp b/test/lib/completions/gprof.exp
index 592786af..996a1efd 100644
--- a/test/lib/completions/gprof.exp
+++ b/test/lib/completions/gprof.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {gprof --help} "" "" "unsupported"]} {
     assert_complete_any "gprof --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/grep.exp b/test/lib/completions/grep.exp
index 3814df71..c94ae727 100644
--- a/test/lib/completions/grep.exp
+++ b/test/lib/completions/grep.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/grub.exp b/test/lib/completions/grub.exp
index 9578e789..b88d1f26 100644
--- a/test/lib/completions/grub.exp
+++ b/test/lib/completions/grub.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/gzip.exp b/test/lib/completions/gzip.exp
index f212c61a..32acf428 100644
--- a/test/lib/completions/gzip.exp
+++ b/test/lib/completions/gzip.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -19,7 +19,7 @@ expect {
     -re "^$cmd\r\n.*$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/hcitool.exp b/test/lib/completions/hcitool.exp
index 9283adff..e6ae0032 100644
--- a/test/lib/completions/hcitool.exp
+++ b/test/lib/completions/hcitool.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/head.exp b/test/lib/completions/head.exp
index 0d4f6a20..7edb8a1b 100644
--- a/test/lib/completions/head.exp
+++ b/test/lib/completions/head.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {head --help} "" "" "unsupported"]} {
     assert_complete_any "head --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/hping2.exp b/test/lib/completions/hping2.exp
index 03af8c96..8919626d 100644
--- a/test/lib/completions/hping2.exp
+++ b/test/lib/completions/hping2.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iconv.exp b/test/lib/completions/iconv.exp
index 420e923c..dcce330f 100644
--- a/test/lib/completions/iconv.exp
+++ b/test/lib/completions/iconv.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/id.exp b/test/lib/completions/id.exp
index 155af52c..b03ee721 100644
--- a/test/lib/completions/id.exp
+++ b/test/lib/completions/id.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/identify.exp b/test/lib/completions/identify.exp
index 8f38ae47..3347c5cd 100644
--- a/test/lib/completions/identify.exp
+++ b/test/lib/completions/identify.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ifdown.exp b/test/lib/completions/ifdown.exp
index 68225bb9..7849f3f7 100644
--- a/test/lib/completions/ifdown.exp
+++ b/test/lib/completions/ifdown.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ifup.exp b/test/lib/completions/ifup.exp
index 9d717178..2c1c010e 100644
--- a/test/lib/completions/ifup.exp
+++ b/test/lib/completions/ifup.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/indent.exp b/test/lib/completions/indent.exp
index e8fc32b1..5c5bb1c7 100644
--- a/test/lib/completions/indent.exp
+++ b/test/lib/completions/indent.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/info.exp b/test/lib/completions/info.exp
index ed769f1a..e7c79e6e 100644
--- a/test/lib/completions/info.exp
+++ b/test/lib/completions/info.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/inject.exp b/test/lib/completions/inject.exp
index 7c093146..4f95be23 100644
--- a/test/lib/completions/inject.exp
+++ b/test/lib/completions/inject.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/insmod.exp b/test/lib/completions/insmod.exp
index 8e83f0b4..a312c894 100644
--- a/test/lib/completions/insmod.exp
+++ b/test/lib/completions/insmod.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/invoke-rc.d.exp b/test/lib/completions/invoke-rc.d.exp
index 4dc9f1d8..d217d17e 100644
--- a/test/lib/completions/invoke-rc.d.exp
+++ b/test/lib/completions/invoke-rc.d.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ipsec.exp b/test/lib/completions/ipsec.exp
index 15617a16..74ef638c 100644
--- a/test/lib/completions/ipsec.exp
+++ b/test/lib/completions/ipsec.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ipv6calc.exp b/test/lib/completions/ipv6calc.exp
index 74ce95f7..42201f0c 100644
--- a/test/lib/completions/ipv6calc.exp
+++ b/test/lib/completions/ipv6calc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/irb.exp b/test/lib/completions/irb.exp
index 81bea6d2..720edfdf 100644
--- a/test/lib/completions/irb.exp
+++ b/test/lib/completions/irb.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/isql.exp b/test/lib/completions/isql.exp
index 87e16bca..ca40faca 100644
--- a/test/lib/completions/isql.exp
+++ b/test/lib/completions/isql.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/ODBCINI=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iwconfig.exp b/test/lib/completions/iwconfig.exp
index f09719d7..82ae11f3 100644
--- a/test/lib/completions/iwconfig.exp
+++ b/test/lib/completions/iwconfig.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iwlist.exp b/test/lib/completions/iwlist.exp
index 80a2c367..43c919ef 100644
--- a/test/lib/completions/iwlist.exp
+++ b/test/lib/completions/iwlist.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iwpriv.exp b/test/lib/completions/iwpriv.exp
index f3102cc5..86b1ee95 100644
--- a/test/lib/completions/iwpriv.exp
+++ b/test/lib/completions/iwpriv.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/iwspy.exp b/test/lib/completions/iwspy.exp
index 5fa0bee5..2894ca4e 100644
--- a/test/lib/completions/iwspy.exp
+++ b/test/lib/completions/iwspy.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/jar.exp b/test/lib/completions/jar.exp
index 0e11f684..d2cb476b 100644
--- a/test/lib/completions/jar.exp
+++ b/test/lib/completions/jar.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/jarsigner.exp b/test/lib/completions/jarsigner.exp
index 075e0263..7ea7cb2e 100644
--- a/test/lib/completions/jarsigner.exp
+++ b/test/lib/completions/jarsigner.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/java.exp b/test/lib/completions/java.exp
index 14610b2f..16b60054 100644
--- a/test/lib/completions/java.exp
+++ b/test/lib/completions/java.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {CLASSPATH=$TESTDIR/fixtures/java/a:$TESTDIR/fixtures/java/bashcomp.jar}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/javac.exp b/test/lib/completions/javac.exp
index 6013de11..948fe8c8 100644
--- a/test/lib/completions/javac.exp
+++ b/test/lib/completions/javac.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/javadoc.exp b/test/lib/completions/javadoc.exp
index 40c922ca..0af8a3da 100644
--- a/test/lib/completions/javadoc.exp
+++ b/test/lib/completions/javadoc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/k3b.exp b/test/lib/completions/k3b.exp
index 86942d67..cde14b86 100644
--- a/test/lib/completions/k3b.exp
+++ b/test/lib/completions/k3b.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kdvi.exp b/test/lib/completions/kdvi.exp
index 0196049a..c7881da1 100644
--- a/test/lib/completions/kdvi.exp
+++ b/test/lib/completions/kdvi.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kill.exp b/test/lib/completions/kill.exp
index ca02650c..1e80fe69 100644
--- a/test/lib/completions/kill.exp
+++ b/test/lib/completions/kill.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/killall.exp b/test/lib/completions/killall.exp
index 763c8e7d..ae8b3d60 100644
--- a/test/lib/completions/killall.exp
+++ b/test/lib/completions/killall.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kldload.exp b/test/lib/completions/kldload.exp
index 0493a10a..a1d87c97 100644
--- a/test/lib/completions/kldload.exp
+++ b/test/lib/completions/kldload.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kldunload.exp b/test/lib/completions/kldunload.exp
index 192159a5..476c5104 100644
--- a/test/lib/completions/kldunload.exp
+++ b/test/lib/completions/kldunload.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kpdf.exp b/test/lib/completions/kpdf.exp
index 010abcfb..4066c9c6 100644
--- a/test/lib/completions/kpdf.exp
+++ b/test/lib/completions/kpdf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/kplayer.exp b/test/lib/completions/kplayer.exp
index 34c9b3bf..4fdfa672 100644
--- a/test/lib/completions/kplayer.exp
+++ b/test/lib/completions/kplayer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/larch.exp b/test/lib/completions/larch.exp
index 076016f2..cefcbe02 100644
--- a/test/lib/completions/larch.exp
+++ b/test/lib/completions/larch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ld.exp b/test/lib/completions/ld.exp
index 60377991..ee660fcb 100644
--- a/test/lib/completions/ld.exp
+++ b/test/lib/completions/ld.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ldd.exp b/test/lib/completions/ldd.exp
index e45d1df7..1c3239c7 100644
--- a/test/lib/completions/ldd.exp
+++ b/test/lib/completions/ldd.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/less.exp b/test/lib/completions/less.exp
index 269c9b5c..78d6ef14 100644
--- a/test/lib/completions/less.exp
+++ b/test/lib/completions/less.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lftp.exp b/test/lib/completions/lftp.exp
index a49a1935..9fcc9a67 100644
--- a/test/lib/completions/lftp.exp
+++ b/test/lib/completions/lftp.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {HOME=$TESTDIR/fixtures/lftp}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lftpget.exp b/test/lib/completions/lftpget.exp
index 7d80216e..0eadb6e9 100644
--- a/test/lib/completions/lftpget.exp
+++ b/test/lib/completions/lftpget.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lilo.exp b/test/lib/completions/lilo.exp
index 505a1470..36ea2c66 100644
--- a/test/lib/completions/lilo.exp
+++ b/test/lib/completions/lilo.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/links.exp b/test/lib/completions/links.exp
index 9f4896aa..4124e2f4 100644
--- a/test/lib/completions/links.exp
+++ b/test/lib/completions/links.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lisp.exp b/test/lib/completions/lisp.exp
index 21663628..5131b45d 100644
--- a/test/lib/completions/lisp.exp
+++ b/test/lib/completions/lisp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/list_admins.exp b/test/lib/completions/list_admins.exp
index e1c9c4dd..3b412136 100644
--- a/test/lib/completions/list_admins.exp
+++ b/test/lib/completions/list_admins.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/list_lists.exp b/test/lib/completions/list_lists.exp
index 789ab1a8..a62dca25 100644
--- a/test/lib/completions/list_lists.exp
+++ b/test/lib/completions/list_lists.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/list_members.exp b/test/lib/completions/list_members.exp
index c93b53d7..8c74cdfb 100644
--- a/test/lib/completions/list_members.exp
+++ b/test/lib/completions/list_members.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/list_owners.exp b/test/lib/completions/list_owners.exp
index c96e0229..65e3ba8e 100644
--- a/test/lib/completions/list_owners.exp
+++ b/test/lib/completions/list_owners.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ln.exp b/test/lib/completions/ln.exp
index 34786071..61405020 100644
--- a/test/lib/completions/ln.exp
+++ b/test/lib/completions/ln.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/look.exp b/test/lib/completions/look.exp
index 53a3c464..8f93db24 100644
--- a/test/lib/completions/look.exp
+++ b/test/lib/completions/look.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {look foo | grep ^foo} words]} {
     assert_complete $words "look foo"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/ls.exp b/test/lib/completions/ls.exp
index db2d41d3..171f6e14 100644
--- a/test/lib/completions/ls.exp
+++ b/test/lib/completions/ls.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {ls --help} "" "" "unsupported"]} {
     assert_complete_any "ls --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/lvchange.exp b/test/lib/completions/lvchange.exp
index ec3886b8..6587a260 100644
--- a/test/lib/completions/lvchange.exp
+++ b/test/lib/completions/lvchange.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvcreate.exp b/test/lib/completions/lvcreate.exp
index 46dceb79..91cb0d81 100644
--- a/test/lib/completions/lvcreate.exp
+++ b/test/lib/completions/lvcreate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvdisplay.exp b/test/lib/completions/lvdisplay.exp
index 5a01a0e5..6fa9c294 100644
--- a/test/lib/completions/lvdisplay.exp
+++ b/test/lib/completions/lvdisplay.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvextend.exp b/test/lib/completions/lvextend.exp
index 24a63853..ded34695 100644
--- a/test/lib/completions/lvextend.exp
+++ b/test/lib/completions/lvextend.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvm.exp b/test/lib/completions/lvm.exp
index 1c67825e..91fe0dcd 100644
--- a/test/lib/completions/lvm.exp
+++ b/test/lib/completions/lvm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvmdiskscan.exp b/test/lib/completions/lvmdiskscan.exp
index 27e566d4..6553865f 100644
--- a/test/lib/completions/lvmdiskscan.exp
+++ b/test/lib/completions/lvmdiskscan.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvreduce.exp b/test/lib/completions/lvreduce.exp
index edd5150d..e2708f89 100644
--- a/test/lib/completions/lvreduce.exp
+++ b/test/lib/completions/lvreduce.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvremove.exp b/test/lib/completions/lvremove.exp
index 1cd63150..8ca1517b 100644
--- a/test/lib/completions/lvremove.exp
+++ b/test/lib/completions/lvremove.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvrename.exp b/test/lib/completions/lvrename.exp
index 51624222..17179ce9 100644
--- a/test/lib/completions/lvrename.exp
+++ b/test/lib/completions/lvrename.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvresize.exp b/test/lib/completions/lvresize.exp
index 830b9ab1..2b3e1044 100644
--- a/test/lib/completions/lvresize.exp
+++ b/test/lib/completions/lvresize.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvs.exp b/test/lib/completions/lvs.exp
index 8b239f5d..e531f7e9 100644
--- a/test/lib/completions/lvs.exp
+++ b/test/lib/completions/lvs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lvscan.exp b/test/lib/completions/lvscan.exp
index 841fd0ed..7b09e5e1 100644
--- a/test/lib/completions/lvscan.exp
+++ b/test/lib/completions/lvscan.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lzma.exp b/test/lib/completions/lzma.exp
index 79d78854..56364d13 100644
--- a/test/lib/completions/lzma.exp
+++ b/test/lib/completions/lzma.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/lzop.exp b/test/lib/completions/lzop.exp
index c33e814e..a7d3da25 100644
--- a/test/lib/completions/lzop.exp
+++ b/test/lib/completions/lzop.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/m4.exp b/test/lib/completions/m4.exp
index 2cc884b3..334132db 100644
--- a/test/lib/completions/m4.exp
+++ b/test/lib/completions/m4.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {m4 --help} "" "" "unsupported"]} {
     assert_complete_any "m4 --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/macof.exp b/test/lib/completions/macof.exp
index e21b1e77..873ae1da 100644
--- a/test/lib/completions/macof.exp
+++ b/test/lib/completions/macof.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mailmanctl.exp b/test/lib/completions/mailmanctl.exp
index a69b7650..2924806a 100644
--- a/test/lib/completions/mailmanctl.exp
+++ b/test/lib/completions/mailmanctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mailsnarf.exp b/test/lib/completions/mailsnarf.exp
index df9981b7..9fb937f3 100644
--- a/test/lib/completions/mailsnarf.exp
+++ b/test/lib/completions/mailsnarf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/make.exp b/test/lib/completions/make.exp
index 90b9e68b..64a393da 100644
--- a/test/lib/completions/make.exp
+++ b/test/lib/completions/make.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/man.exp b/test/lib/completions/man.exp
index 62c14c86..47a6575f 100644
--- a/test/lib/completions/man.exp
+++ b/test/lib/completions/man.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mc.exp b/test/lib/completions/mc.exp
index 866161ba..eb97246d 100644
--- a/test/lib/completions/mc.exp
+++ b/test/lib/completions/mc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mcrypt.exp b/test/lib/completions/mcrypt.exp
index bfc5d2d2..525ccbc3 100644
--- a/test/lib/completions/mcrypt.exp
+++ b/test/lib/completions/mcrypt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/md5sum.exp b/test/lib/completions/md5sum.exp
index 25290b56..54ed6416 100644
--- a/test/lib/completions/md5sum.exp
+++ b/test/lib/completions/md5sum.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mdecrypt.exp b/test/lib/completions/mdecrypt.exp
index 4e49ae12..8d9d9f59 100644
--- a/test/lib/completions/mdecrypt.exp
+++ b/test/lib/completions/mdecrypt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mencoder.exp b/test/lib/completions/mencoder.exp
index 169dcb71..db29f66a 100644
--- a/test/lib/completions/mencoder.exp
+++ b/test/lib/completions/mencoder.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/minicom.exp b/test/lib/completions/minicom.exp
index 935502f1..dfc96c01 100644
--- a/test/lib/completions/minicom.exp
+++ b/test/lib/completions/minicom.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mkdir.exp b/test/lib/completions/mkdir.exp
index 43dfec7e..a9333564 100644
--- a/test/lib/completions/mkdir.exp
+++ b/test/lib/completions/mkdir.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mkfifo.exp b/test/lib/completions/mkfifo.exp
index c6343f8d..59412a2e 100644
--- a/test/lib/completions/mkfifo.exp
+++ b/test/lib/completions/mkfifo.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mkinitrd.exp b/test/lib/completions/mkinitrd.exp
index cfb316e5..007f278d 100644
--- a/test/lib/completions/mkinitrd.exp
+++ b/test/lib/completions/mkinitrd.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mkisofs.exp b/test/lib/completions/mkisofs.exp
index ad24ea06..98780b1e 100644
--- a/test/lib/completions/mkisofs.exp
+++ b/test/lib/completions/mkisofs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -25,7 +25,7 @@ expect {
     -re "^$cmd\r\n\\d+.*$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
@@ -39,7 +39,7 @@ expect {
     -re "^$cmd\r\n\\d+.*$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/mknod.exp b/test/lib/completions/mknod.exp
index 2c58cade..145f4531 100644
--- a/test/lib/completions/mknod.exp
+++ b/test/lib/completions/mknod.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mmsitepass.exp b/test/lib/completions/mmsitepass.exp
index d69fa202..4dde214f 100644
--- a/test/lib/completions/mmsitepass.exp
+++ b/test/lib/completions/mmsitepass.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/module.exp b/test/lib/completions/module.exp
index a34667d4..5e36a6da 100644
--- a/test/lib/completions/module.exp
+++ b/test/lib/completions/module.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mogrify.exp b/test/lib/completions/mogrify.exp
index ef7e18ee..84ceeff5 100644
--- a/test/lib/completions/mogrify.exp
+++ b/test/lib/completions/mogrify.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/montage.exp b/test/lib/completions/montage.exp
index 736609a5..4d85e1a4 100644
--- a/test/lib/completions/montage.exp
+++ b/test/lib/completions/montage.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mplayer.exp b/test/lib/completions/mplayer.exp
index 69e5d971..9230a86d 100644
--- a/test/lib/completions/mplayer.exp
+++ b/test/lib/completions/mplayer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/msgsnarf.exp b/test/lib/completions/msgsnarf.exp
index 74f458ff..c542e33e 100644
--- a/test/lib/completions/msgsnarf.exp
+++ b/test/lib/completions/msgsnarf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mtx.exp b/test/lib/completions/mtx.exp
index a518d79f..1de15269 100644
--- a/test/lib/completions/mtx.exp
+++ b/test/lib/completions/mtx.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mutt.exp b/test/lib/completions/mutt.exp
index 6c727daf..91eb2457 100644
--- a/test/lib/completions/mutt.exp
+++ b/test/lib/completions/mutt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/muttng.exp b/test/lib/completions/muttng.exp
index 25a474ad..32239128 100644
--- a/test/lib/completions/muttng.exp
+++ b/test/lib/completions/muttng.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mv.exp b/test/lib/completions/mv.exp
index f2576df7..d65c4868 100644
--- a/test/lib/completions/mv.exp
+++ b/test/lib/completions/mv.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/mysqladmin.exp b/test/lib/completions/mysqladmin.exp
index 76381587..ae9b8ce8 100644
--- a/test/lib/completions/mysqladmin.exp
+++ b/test/lib/completions/mysqladmin.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ncftp.exp b/test/lib/completions/ncftp.exp
index ad71f226..52d70756 100644
--- a/test/lib/completions/ncftp.exp
+++ b/test/lib/completions/ncftp.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/netstat.exp b/test/lib/completions/netstat.exp
index 0e6414d6..e4ef676c 100644
--- a/test/lib/completions/netstat.exp
+++ b/test/lib/completions/netstat.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/newlist.exp b/test/lib/completions/newlist.exp
index bebf600d..0696ec5e 100644
--- a/test/lib/completions/newlist.exp
+++ b/test/lib/completions/newlist.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/nl.exp b/test/lib/completions/nl.exp
index 02076dff..b7255ac2 100644
--- a/test/lib/completions/nl.exp
+++ b/test/lib/completions/nl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/nm.exp b/test/lib/completions/nm.exp
index 551f49e9..9ce73d45 100644
--- a/test/lib/completions/nm.exp
+++ b/test/lib/completions/nm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ntpdate.exp b/test/lib/completions/ntpdate.exp
index 6a6456f4..7a7dd716 100644
--- a/test/lib/completions/ntpdate.exp
+++ b/test/lib/completions/ntpdate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/objcopy.exp b/test/lib/completions/objcopy.exp
index acb6539a..29be7e62 100644
--- a/test/lib/completions/objcopy.exp
+++ b/test/lib/completions/objcopy.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/objdump.exp b/test/lib/completions/objdump.exp
index 5eec35d6..c1f62e35 100644
--- a/test/lib/completions/objdump.exp
+++ b/test/lib/completions/objdump.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/od.exp b/test/lib/completions/od.exp
index 5838218c..e2712d12 100644
--- a/test/lib/completions/od.exp
+++ b/test/lib/completions/od.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/openssl.exp b/test/lib/completions/openssl.exp
index 651e5e6d..25fc1367 100644
--- a/test/lib/completions/openssl.exp
+++ b/test/lib/completions/openssl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -19,7 +19,7 @@ expect {
     -re "^$cmd\r\n.*$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/p4.exp b/test/lib/completions/p4.exp
index 369d2c6b..20d8fb6e 100644
--- a/test/lib/completions/p4.exp
+++ b/test/lib/completions/p4.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pack200.exp b/test/lib/completions/pack200.exp
index f96eff13..537bf327 100644
--- a/test/lib/completions/pack200.exp
+++ b/test/lib/completions/pack200.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/paste.exp b/test/lib/completions/paste.exp
index 3a4e93be..224d9dd9 100644
--- a/test/lib/completions/paste.exp
+++ b/test/lib/completions/paste.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/patch.exp b/test/lib/completions/patch.exp
index a44fa130..07e88f15 100644
--- a/test/lib/completions/patch.exp
+++ b/test/lib/completions/patch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/perl.exp b/test/lib/completions/perl.exp
index 2199c994..e02bd454 100644
--- a/test/lib/completions/perl.exp
+++ b/test/lib/completions/perl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/perldoc.exp b/test/lib/completions/perldoc.exp
index b3ff83b3..d4461df9 100644
--- a/test/lib/completions/perldoc.exp
+++ b/test/lib/completions/perldoc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -29,7 +29,7 @@ expect {
     -re "perldoc File::File::" { fail "$test" }
     -re /@ { unresolved "$test" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/pgrep.exp b/test/lib/completions/pgrep.exp
index 63143acc..c27c4f21 100644
--- a/test/lib/completions/pgrep.exp
+++ b/test/lib/completions/pgrep.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pine.exp b/test/lib/completions/pine.exp
index 0a0c3f40..622bf064 100644
--- a/test/lib/completions/pine.exp
+++ b/test/lib/completions/pine.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ping.exp b/test/lib/completions/ping.exp
index b600849b..3e419966 100644
--- a/test/lib/completions/ping.exp
+++ b/test/lib/completions/ping.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkg-config.exp b/test/lib/completions/pkg-config.exp
index 477dba08..adf9a301 100644
--- a/test/lib/completions/pkg-config.exp
+++ b/test/lib/completions/pkg-config.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkg_deinstall.exp b/test/lib/completions/pkg_deinstall.exp
index 8f3d8c3d..e61d0ce3 100644
--- a/test/lib/completions/pkg_deinstall.exp
+++ b/test/lib/completions/pkg_deinstall.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {PKG_DBDIR=fixtures/pkgtools/db}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkg_delete.exp b/test/lib/completions/pkg_delete.exp
index b0c1a2a5..37ce4035 100644
--- a/test/lib/completions/pkg_delete.exp
+++ b/test/lib/completions/pkg_delete.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkg_info.exp b/test/lib/completions/pkg_info.exp
index 3f253ccf..ad8ed84e 100644
--- a/test/lib/completions/pkg_info.exp
+++ b/test/lib/completions/pkg_info.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pkill.exp b/test/lib/completions/pkill.exp
index 0333fc94..6faddfc3 100644
--- a/test/lib/completions/pkill.exp
+++ b/test/lib/completions/pkill.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/portinstall.exp b/test/lib/completions/portinstall.exp
index d70f5db6..9f44e96b 100644
--- a/test/lib/completions/portinstall.exp
+++ b/test/lib/completions/portinstall.exp
@@ -1,13 +1,13 @@
 proc setup {} {
     assert_bash_exec {PORTSDIR=fixtures/pkgtools/ports ; sed -e s,PORTSDIR,$PORTSDIR,g $PORTSDIR/INDEX.dist > $PORTSDIR/INDEX ; cp $PORTSDIR/INDEX $PORTSDIR/INDEX-5}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_bash_exec {rm fixtures/pkgtools/ports/INDEX fixtures/pkgtools/ports/INDEX-5}
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/portupgrade.exp b/test/lib/completions/portupgrade.exp
index cb583923..62b5789d 100644
--- a/test/lib/completions/portupgrade.exp
+++ b/test/lib/completions/portupgrade.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {PKG_DBDIR=fixtures/pkgtools/db}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/povray.exp b/test/lib/completions/povray.exp
index 1efeeddb..30d58e48 100644
--- a/test/lib/completions/povray.exp
+++ b/test/lib/completions/povray.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pr.exp b/test/lib/completions/pr.exp
index 5d7a96c3..478017b2 100644
--- a/test/lib/completions/pr.exp
+++ b/test/lib/completions/pr.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/psql.exp b/test/lib/completions/psql.exp
index 56d56666..3dbffaf2 100644
--- a/test/lib/completions/psql.exp
+++ b/test/lib/completions/psql.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ptx.exp b/test/lib/completions/ptx.exp
index 2defe049..220243c3 100644
--- a/test/lib/completions/ptx.exp
+++ b/test/lib/completions/ptx.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvchange.exp b/test/lib/completions/pvchange.exp
index fd4b73d0..a43ae9cd 100644
--- a/test/lib/completions/pvchange.exp
+++ b/test/lib/completions/pvchange.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvcreate.exp b/test/lib/completions/pvcreate.exp
index 47cebf7a..6bc9d4eb 100644
--- a/test/lib/completions/pvcreate.exp
+++ b/test/lib/completions/pvcreate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvdisplay.exp b/test/lib/completions/pvdisplay.exp
index 151064cd..b9db558b 100644
--- a/test/lib/completions/pvdisplay.exp
+++ b/test/lib/completions/pvdisplay.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvmove.exp b/test/lib/completions/pvmove.exp
index 81c05e98..24d17006 100644
--- a/test/lib/completions/pvmove.exp
+++ b/test/lib/completions/pvmove.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvremove.exp b/test/lib/completions/pvremove.exp
index dd145bf6..1febcf37 100644
--- a/test/lib/completions/pvremove.exp
+++ b/test/lib/completions/pvremove.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvs.exp b/test/lib/completions/pvs.exp
index 6e5527e1..e50501a3 100644
--- a/test/lib/completions/pvs.exp
+++ b/test/lib/completions/pvs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/pvscan.exp b/test/lib/completions/pvscan.exp
index e92cdbe0..d3b8ad33 100644
--- a/test/lib/completions/pvscan.exp
+++ b/test/lib/completions/pvscan.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/python.exp b/test/lib/completions/python.exp
index c9d70b43..57520cdf 100644
--- a/test/lib/completions/python.exp
+++ b/test/lib/completions/python.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/qrunner.exp b/test/lib/completions/qrunner.exp
index b8fcf191..0dec16cc 100644
--- a/test/lib/completions/qrunner.exp
+++ b/test/lib/completions/qrunner.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/querybts.exp b/test/lib/completions/querybts.exp
index dc75cd62..4ed09d8a 100644
--- a/test/lib/completions/querybts.exp
+++ b/test/lib/completions/querybts.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rcs.exp b/test/lib/completions/rcs.exp
index 19ae4d50..781ac37f 100644
--- a/test/lib/completions/rcs.exp
+++ b/test/lib/completions/rcs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rcsdiff.exp b/test/lib/completions/rcsdiff.exp
index 8383cdb9..23b009c6 100644
--- a/test/lib/completions/rcsdiff.exp
+++ b/test/lib/completions/rcsdiff.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rdict.exp b/test/lib/completions/rdict.exp
index aa132617..5d6ad847 100644
--- a/test/lib/completions/rdict.exp
+++ b/test/lib/completions/rdict.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/readelf.exp b/test/lib/completions/readelf.exp
index a084a41e..c2d5ee5b 100644
--- a/test/lib/completions/readelf.exp
+++ b/test/lib/completions/readelf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/readonly.exp b/test/lib/completions/readonly.exp
index 84be3c96..cf64ca0a 100644
--- a/test/lib/completions/readonly.exp
+++ b/test/lib/completions/readonly.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/remove_members.exp b/test/lib/completions/remove_members.exp
index 63d6a70e..59f7b6c4 100644
--- a/test/lib/completions/remove_members.exp
+++ b/test/lib/completions/remove_members.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/removepkg.exp b/test/lib/completions/removepkg.exp
index 7cf98805..882f1e70 100644
--- a/test/lib/completions/removepkg.exp
+++ b/test/lib/completions/removepkg.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/renice.exp b/test/lib/completions/renice.exp
index c91e0212..fdc859b4 100644
--- a/test/lib/completions/renice.exp
+++ b/test/lib/completions/renice.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -19,7 +19,7 @@ expect {
     -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
@@ -33,7 +33,7 @@ expect {
     -re "$cmd\r\n\\d+.*/@$cmd$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/reportbug.exp b/test/lib/completions/reportbug.exp
index 1f66df2c..660778f7 100644
--- a/test/lib/completions/reportbug.exp
+++ b/test/lib/completions/reportbug.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ri.exp b/test/lib/completions/ri.exp
index 160dc9a7..cd138ea0 100644
--- a/test/lib/completions/ri.exp
+++ b/test/lib/completions/ri.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rlog.exp b/test/lib/completions/rlog.exp
index cbc06857..87984a8d 100644
--- a/test/lib/completions/rlog.exp
+++ b/test/lib/completions/rlog.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rm.exp b/test/lib/completions/rm.exp
index ae670e83..f764a8e7 100644
--- a/test/lib/completions/rm.exp
+++ b/test/lib/completions/rm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rmdir.exp b/test/lib/completions/rmdir.exp
index 2b23a9c5..cc604761 100644
--- a/test/lib/completions/rmdir.exp
+++ b/test/lib/completions/rmdir.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rmlist.exp b/test/lib/completions/rmlist.exp
index 91519ee8..d530d117 100644
--- a/test/lib/completions/rmlist.exp
+++ b/test/lib/completions/rmlist.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rpcdebug.exp b/test/lib/completions/rpcdebug.exp
index 8629c947..7f1a1c2f 100644
--- a/test/lib/completions/rpcdebug.exp
+++ b/test/lib/completions/rpcdebug.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rpm.exp b/test/lib/completions/rpm.exp
index 3ed154a9..82ab28dc 100644
--- a/test/lib/completions/rpm.exp
+++ b/test/lib/completions/rpm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -20,7 +20,7 @@ sync_after_int
     # Build list of installed packages
 if {[assert_exec {rpm -qa --qf=%\{NAME\}\n | sort -u} packages]} {
     assert_complete $packages "rpm -q "
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/rsync.exp b/test/lib/completions/rsync.exp
index fb301a35..221d090b 100644
--- a/test/lib/completions/rsync.exp
+++ b/test/lib/completions/rsync.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/rtcwake.exp b/test/lib/completions/rtcwake.exp
index 0b9a974b..21c05eab 100644
--- a/test/lib/completions/rtcwake.exp
+++ b/test/lib/completions/rtcwake.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sbcl-mt.exp b/test/lib/completions/sbcl-mt.exp
index 45e81f79..d328fec3 100644
--- a/test/lib/completions/sbcl-mt.exp
+++ b/test/lib/completions/sbcl-mt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sbcl.exp b/test/lib/completions/sbcl.exp
index b68b2dce..c6f908f6 100644
--- a/test/lib/completions/sbcl.exp
+++ b/test/lib/completions/sbcl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/scp.exp b/test/lib/completions/scp.exp
index efe2b686..e1f7336e 100644
--- a/test/lib/completions/scp.exp
+++ b/test/lib/completions/scp.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
         /BASH_SOURCE=/d
         /OLDPWD=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -31,7 +31,7 @@ if {
         #       in `$HOME/.ssh/config' or `/etc/ssh_config'
     set host_pwd ""
     unsupported $test
-}; # if
+}
 
 
     # Try completion
@@ -41,7 +41,7 @@ sync_after_tab
 expect {
     -re "^$cmd$host_pwd.*$" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
-}; # expect
+}
 
 
 sync_after_int
@@ -56,7 +56,7 @@ set test "Tab should complete known-hosts"
 set expected {}
 foreach host [get_hosts] {
     lappend expected "$host:"
-}; # foreach
+}
 lappend expected doo: gee: hus: ike:
     # Append local filenames
 lappend expected config known_hosts "spaced\\ \\ conf"
@@ -76,7 +76,7 @@ expect {
     -re "^$cmd\r\n.*\r\n/@" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -88,7 +88,7 @@ set test "Config file containing space should work"
 set expected {}
 foreach host [get_hosts] {
     lappend expected "$host:"
-}; # foreach
+}
     # Hosts `gee', `hus' and `jar' are defined in "./fixtures/scp/spaced  conf"
     # Hosts `doo' and `ike' are defined in ./fixtures/scp/known_hosts
 lappend expected doo: gee: hus: ike: jar:
@@ -105,12 +105,12 @@ if {[match_items [lsort -unique $expected] $test]} {
     expect {
         -re $prompt { pass "$test" }
         -re eof { unresolved "eof" }
-    }; # expect
+    }
 } else {
     # Expected failure (known bug) because of bash-4 bug in quoted words:
     # http://www.mail-archive.com/bug-bash@gnu.org/msg06095.html
     if {[lindex $::BASH_VERSINFO 0] >= 4} {xfail "$test"} {fail "$test"}
-}; # if
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
diff --git a/test/lib/completions/screen.exp b/test/lib/completions/screen.exp
index 985862c1..a1a20138 100644
--- a/test/lib/completions/screen.exp
+++ b/test/lib/completions/screen.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD=/d}
-}; # teardown()
+}
 
 
 setup
@@ -40,7 +40,7 @@ expect {
     }
     -re $prompt { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
diff --git a/test/lib/completions/sed.exp b/test/lib/completions/sed.exp
index 8764cfb8..dd480a60 100644
--- a/test/lib/completions/sed.exp
+++ b/test/lib/completions/sed.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {sed --help} "" "" "unsupported"]} {
     assert_complete_any "sed --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/seq.exp b/test/lib/completions/seq.exp
index b5333ef9..6e5ef8dc 100644
--- a/test/lib/completions/seq.exp
+++ b/test/lib/completions/seq.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/service.exp b/test/lib/completions/service.exp
index 917c5dcb..f3cf7355 100644
--- a/test/lib/completions/service.exp
+++ b/test/lib/completions/service.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/set.exp b/test/lib/completions/set.exp
index 2b2d40e9..c14ecff6 100644
--- a/test/lib/completions/set.exp
+++ b/test/lib/completions/set.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sftp.exp b/test/lib/completions/sftp.exp
index 24c37cb5..7a197c7c 100644
--- a/test/lib/completions/sftp.exp
+++ b/test/lib/completions/sftp.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
         /BASH_SOURCE=/d
         /OLDPWD=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -36,7 +36,7 @@ expect {
     -re "^$cmd\r\n.*\r\n/@" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -69,7 +69,7 @@ expect {
     -re "aced  conf" { xfail "$test" }
     -re $prompt { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
diff --git a/test/lib/completions/sha1sum.exp b/test/lib/completions/sha1sum.exp
index 17519087..c5983044 100644
--- a/test/lib/completions/sha1sum.exp
+++ b/test/lib/completions/sha1sum.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/shar.exp b/test/lib/completions/shar.exp
index 7ace9d6e..604a2031 100644
--- a/test/lib/completions/shar.exp
+++ b/test/lib/completions/shar.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sitecopy.exp b/test/lib/completions/sitecopy.exp
index 49b78918..7e0c87fe 100644
--- a/test/lib/completions/sitecopy.exp
+++ b/test/lib/completions/sitecopy.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/smartctl.exp b/test/lib/completions/smartctl.exp
index a9eeb956..24919396 100644
--- a/test/lib/completions/smartctl.exp
+++ b/test/lib/completions/smartctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/snownews.exp b/test/lib/completions/snownews.exp
index 7502e587..c8ad6741 100644
--- a/test/lib/completions/snownews.exp
+++ b/test/lib/completions/snownews.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sort.exp b/test/lib/completions/sort.exp
index 20516cc8..a130bbc8 100644
--- a/test/lib/completions/sort.exp
+++ b/test/lib/completions/sort.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/split.exp b/test/lib/completions/split.exp
index b74da369..e13df49a 100644
--- a/test/lib/completions/split.exp
+++ b/test/lib/completions/split.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {split --help} "" "" "unsupported"]} {
     assert_complete_any "split --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/spovray.exp b/test/lib/completions/spovray.exp
index 30d81853..2b2c33de 100644
--- a/test/lib/completions/spovray.exp
+++ b/test/lib/completions/spovray.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ssh.exp b/test/lib/completions/ssh.exp
index 91955c1d..7a511eab 100644
--- a/test/lib/completions/ssh.exp
+++ b/test/lib/completions/ssh.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -9,7 +9,7 @@ proc teardown {} {
         /BASH_SOURCE=/d
         /OLDPWD=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -27,7 +27,7 @@ expect {
     -re $expected  { pass "$test" }
     -re $prompt { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
@@ -45,7 +45,7 @@ expect {
     -re "^$cmd\r\n.*\r\n/@" { pass "$test" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -82,7 +82,7 @@ expect {
     -re "aced  conf" { xfail "$test" }
     -re $prompt { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}
 
diff --git a/test/lib/completions/sshmitm.exp b/test/lib/completions/sshmitm.exp
index b8f8a2c9..13b50673 100644
--- a/test/lib/completions/sshmitm.exp
+++ b/test/lib/completions/sshmitm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sshow.exp b/test/lib/completions/sshow.exp
index 36a6cc2c..074d7b12 100644
--- a/test/lib/completions/sshow.exp
+++ b/test/lib/completions/sshow.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/strace.exp b/test/lib/completions/strace.exp
index 55004d20..933d1b48 100644
--- a/test/lib/completions/strace.exp
+++ b/test/lib/completions/strace.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/strip.exp b/test/lib/completions/strip.exp
index 46d9f362..00f4ab9c 100644
--- a/test/lib/completions/strip.exp
+++ b/test/lib/completions/strip.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sudo.exp b/test/lib/completions/sudo.exp
index 1299a6da..e7a39162 100644
--- a/test/lib/completions/sudo.exp
+++ b/test/lib/completions/sudo.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/svk.exp b/test/lib/completions/svk.exp
index a08674dc..a794a008 100644
--- a/test/lib/completions/svk.exp
+++ b/test/lib/completions/svk.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/svn.exp b/test/lib/completions/svn.exp
index fe40d6f7..d1a08ae4 100644
--- a/test/lib/completions/svn.exp
+++ b/test/lib/completions/svn.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/svnadmin.exp b/test/lib/completions/svnadmin.exp
index 35e07021..f20d52cf 100644
--- a/test/lib/completions/svnadmin.exp
+++ b/test/lib/completions/svnadmin.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/svnlook.exp b/test/lib/completions/svnlook.exp
index 33b67052..114435ec 100644
--- a/test/lib/completions/svnlook.exp
+++ b/test/lib/completions/svnlook.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sync_members.exp b/test/lib/completions/sync_members.exp
index 4cb84ad8..817432bb 100644
--- a/test/lib/completions/sync_members.exp
+++ b/test/lib/completions/sync_members.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/sysctl.exp b/test/lib/completions/sysctl.exp
index e1866f55..d163ea5a 100644
--- a/test/lib/completions/sysctl.exp
+++ b/test/lib/completions/sysctl.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {sysctl -N -a 2>/dev/null | grep ^kern | sort -u} values]} {
     assert_complete $values "sysctl kern"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/tac.exp b/test/lib/completions/tac.exp
index 21230052..d4fe7937 100644
--- a/test/lib/completions/tac.exp
+++ b/test/lib/completions/tac.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tail.exp b/test/lib/completions/tail.exp
index c8a82d97..fd685b1a 100644
--- a/test/lib/completions/tail.exp
+++ b/test/lib/completions/tail.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {tail --help} "" "" "unsupported"]} {
     assert_complete_any "tail --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/tar.exp b/test/lib/completions/tar.exp
index 43c60ff9..37f1ae4b 100644
--- a/test/lib/completions/tar.exp
+++ b/test/lib/completions/tar.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tcpkill.exp b/test/lib/completions/tcpkill.exp
index e8cc9c10..d3a45e43 100644
--- a/test/lib/completions/tcpkill.exp
+++ b/test/lib/completions/tcpkill.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tcpnice.exp b/test/lib/completions/tcpnice.exp
index 44bb59c6..b4b93097 100644
--- a/test/lib/completions/tcpnice.exp
+++ b/test/lib/completions/tcpnice.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tee.exp b/test/lib/completions/tee.exp
index c25057ba..1058bb8e 100644
--- a/test/lib/completions/tee.exp
+++ b/test/lib/completions/tee.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/texindex.exp b/test/lib/completions/texindex.exp
index d5b8cd77..43b4c09a 100644
--- a/test/lib/completions/texindex.exp
+++ b/test/lib/completions/texindex.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/tightvncviewer.exp b/test/lib/completions/tightvncviewer.exp
index 6eba24c2..ee987f60 100644
--- a/test/lib/completions/tightvncviewer.exp
+++ b/test/lib/completions/tightvncviewer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/time.exp b/test/lib/completions/time.exp
index b114318b..3bed4fdf 100644
--- a/test/lib/completions/time.exp
+++ b/test/lib/completions/time.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/touch.exp b/test/lib/completions/touch.exp
index f0960ef7..61d22b33 100644
--- a/test/lib/completions/touch.exp
+++ b/test/lib/completions/touch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {touch --help} "" "" "unsupported"]} {
     assert_complete_any "touch --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/tr.exp b/test/lib/completions/tr.exp
index 68b11a36..c10c8ba1 100644
--- a/test/lib/completions/tr.exp
+++ b/test/lib/completions/tr.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {tr --help} "" "" "unsupported"]} {
     assert_complete_any "tr --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/unace.exp b/test/lib/completions/unace.exp
index 0afbaafb..c9d7606e 100644
--- a/test/lib/completions/unace.exp
+++ b/test/lib/completions/unace.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/uname.exp b/test/lib/completions/uname.exp
index 2179dafd..0c363ab5 100644
--- a/test/lib/completions/uname.exp
+++ b/test/lib/completions/uname.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {uname --help} "" "" "unsupported"]} {
     assert_complete_any "uname --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/unexpand.exp b/test/lib/completions/unexpand.exp
index 31822561..c9aecc25 100644
--- a/test/lib/completions/unexpand.exp
+++ b/test/lib/completions/unexpand.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {unexpand --help} "" "" "unsupported"]} {
     assert_complete_any "unexpand --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/uniq.exp b/test/lib/completions/uniq.exp
index 20dbcfac..d516106c 100644
--- a/test/lib/completions/uniq.exp
+++ b/test/lib/completions/uniq.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {uniq --help} "" "" "unsupported"]} {
     assert_complete_any "uniq --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/units.exp b/test/lib/completions/units.exp
index a40b5f3f..96ec91d1 100644
--- a/test/lib/completions/units.exp
+++ b/test/lib/completions/units.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {units --help} "" "" "unsupported"]} {
     assert_complete_any "units --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/unpack200.exp b/test/lib/completions/unpack200.exp
index 845701dd..b4360491 100644
--- a/test/lib/completions/unpack200.exp
+++ b/test/lib/completions/unpack200.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/unrar.exp b/test/lib/completions/unrar.exp
index e66e3c8b..b5e27b21 100644
--- a/test/lib/completions/unrar.exp
+++ b/test/lib/completions/unrar.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/unset.exp b/test/lib/completions/unset.exp
index a5e7fc9b..42e753cb 100644
--- a/test/lib/completions/unset.exp
+++ b/test/lib/completions/unset.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/unshunt.exp b/test/lib/completions/unshunt.exp
index 964cac68..96cd5860 100644
--- a/test/lib/completions/unshunt.exp
+++ b/test/lib/completions/unshunt.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/update-alternatives.exp b/test/lib/completions/update-alternatives.exp
index 10ff4e6d..b94d88c5 100644
--- a/test/lib/completions/update-alternatives.exp
+++ b/test/lib/completions/update-alternatives.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/update-rc.d.exp b/test/lib/completions/update-rc.d.exp
index 9c2c2464..f2eafea5 100644
--- a/test/lib/completions/update-rc.d.exp
+++ b/test/lib/completions/update-rc.d.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/urlsnarf.exp b/test/lib/completions/urlsnarf.exp
index c5b26922..ed543629 100644
--- a/test/lib/completions/urlsnarf.exp
+++ b/test/lib/completions/urlsnarf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vdir.exp b/test/lib/completions/vdir.exp
index b525c382..c0e5ee43 100644
--- a/test/lib/completions/vdir.exp
+++ b/test/lib/completions/vdir.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgcfgbackup.exp b/test/lib/completions/vgcfgbackup.exp
index 19ceeeca..b7e509a2 100644
--- a/test/lib/completions/vgcfgbackup.exp
+++ b/test/lib/completions/vgcfgbackup.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgcfgrestore.exp b/test/lib/completions/vgcfgrestore.exp
index e1c3c3b9..e40cd213 100644
--- a/test/lib/completions/vgcfgrestore.exp
+++ b/test/lib/completions/vgcfgrestore.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgchange.exp b/test/lib/completions/vgchange.exp
index 645eedb4..b6c0e1df 100644
--- a/test/lib/completions/vgchange.exp
+++ b/test/lib/completions/vgchange.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgck.exp b/test/lib/completions/vgck.exp
index 67209b15..b4d58aec 100644
--- a/test/lib/completions/vgck.exp
+++ b/test/lib/completions/vgck.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgconvert.exp b/test/lib/completions/vgconvert.exp
index 065c4828..362c44b6 100644
--- a/test/lib/completions/vgconvert.exp
+++ b/test/lib/completions/vgconvert.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgcreate.exp b/test/lib/completions/vgcreate.exp
index 7c324e62..4cb7dd45 100644
--- a/test/lib/completions/vgcreate.exp
+++ b/test/lib/completions/vgcreate.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgdisplay.exp b/test/lib/completions/vgdisplay.exp
index b6bc9125..6a8ed84d 100644
--- a/test/lib/completions/vgdisplay.exp
+++ b/test/lib/completions/vgdisplay.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgexport.exp b/test/lib/completions/vgexport.exp
index 2ad4230e..2900960f 100644
--- a/test/lib/completions/vgexport.exp
+++ b/test/lib/completions/vgexport.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgextend.exp b/test/lib/completions/vgextend.exp
index 18a491d2..3c46a8f0 100644
--- a/test/lib/completions/vgextend.exp
+++ b/test/lib/completions/vgextend.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgimport.exp b/test/lib/completions/vgimport.exp
index e4568f3b..ed04e282 100644
--- a/test/lib/completions/vgimport.exp
+++ b/test/lib/completions/vgimport.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgmerge.exp b/test/lib/completions/vgmerge.exp
index 8ba5e893..a4f8833b 100644
--- a/test/lib/completions/vgmerge.exp
+++ b/test/lib/completions/vgmerge.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgmknodes.exp b/test/lib/completions/vgmknodes.exp
index d24552f0..5c9feeb3 100644
--- a/test/lib/completions/vgmknodes.exp
+++ b/test/lib/completions/vgmknodes.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgreduce.exp b/test/lib/completions/vgreduce.exp
index 887ba8de..f6af3150 100644
--- a/test/lib/completions/vgreduce.exp
+++ b/test/lib/completions/vgreduce.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgremove.exp b/test/lib/completions/vgremove.exp
index 26dadf95..0dc5eda8 100644
--- a/test/lib/completions/vgremove.exp
+++ b/test/lib/completions/vgremove.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgrename.exp b/test/lib/completions/vgrename.exp
index 8ddaa758..81438631 100644
--- a/test/lib/completions/vgrename.exp
+++ b/test/lib/completions/vgrename.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgs.exp b/test/lib/completions/vgs.exp
index a27e3650..22ab176b 100644
--- a/test/lib/completions/vgs.exp
+++ b/test/lib/completions/vgs.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgscan.exp b/test/lib/completions/vgscan.exp
index 4bb8c35e..ae8168c8 100644
--- a/test/lib/completions/vgscan.exp
+++ b/test/lib/completions/vgscan.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vgsplit.exp b/test/lib/completions/vgsplit.exp
index 54e7034f..b183cfda 100644
--- a/test/lib/completions/vgsplit.exp
+++ b/test/lib/completions/vgsplit.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/vncviewer.exp b/test/lib/completions/vncviewer.exp
index 3d47f49f..8c51e0b2 100644
--- a/test/lib/completions/vncviewer.exp
+++ b/test/lib/completions/vncviewer.exp
@@ -1,13 +1,13 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {
         /declare -f _vncviewer_bootstrap/d
     }
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wc.exp b/test/lib/completions/wc.exp
index 8ad2bf8d..b261b6a7 100644
--- a/test/lib/completions/wc.exp
+++ b/test/lib/completions/wc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {wc --help} "" "" "unsupported"]} {
     assert_complete_any "wc --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/webmitm.exp b/test/lib/completions/webmitm.exp
index 1d48a3a6..adb97cc2 100644
--- a/test/lib/completions/webmitm.exp
+++ b/test/lib/completions/webmitm.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wget.exp b/test/lib/completions/wget.exp
index 245b27be..8e830a12 100644
--- a/test/lib/completions/wget.exp
+++ b/test/lib/completions/wget.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/who.exp b/test/lib/completions/who.exp
index 73928ef7..6cca6795 100644
--- a/test/lib/completions/who.exp
+++ b/test/lib/completions/who.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -13,7 +13,7 @@ setup
 
 if {[assert_exec {who --help} "" "" "unsupported"]} {
     assert_complete_any "who --"
-}; # if
+}
 
 
 sync_after_int
diff --git a/test/lib/completions/withlist.exp b/test/lib/completions/withlist.exp
index 6310466d..e1f91f6a 100644
--- a/test/lib/completions/withlist.exp
+++ b/test/lib/completions/withlist.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wol.exp b/test/lib/completions/wol.exp
index 84a2d88d..a06a2ae9 100644
--- a/test/lib/completions/wol.exp
+++ b/test/lib/completions/wol.exp
@@ -2,13 +2,13 @@ proc setup {} {
     # See fixtures/shared/bin/{arp,ifconfig}
     assert_bash_exec {OLDPATH="$PATH"; PATH="$TESTDIR/fixtures/shared/bin:$PATH";}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
     assert_bash_exec {PATH="$OLDPATH"; unset -v OLDPATH}
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wtf.exp b/test/lib/completions/wtf.exp
index 8250becc..b1693c80 100644
--- a/test/lib/completions/wtf.exp
+++ b/test/lib/completions/wtf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/wvdial.exp b/test/lib/completions/wvdial.exp
index 8d4669de..5b52daa8 100644
--- a/test/lib/completions/wvdial.exp
+++ b/test/lib/completions/wvdial.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xhost.exp b/test/lib/completions/xhost.exp
index aeceadb6..d4098ade 100644
--- a/test/lib/completions/xhost.exp
+++ b/test/lib/completions/xhost.exp
@@ -1,12 +1,12 @@
 proc setup {} {
     assert_bash_exec {HOME=$TESTDIR}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
@@ -17,7 +17,7 @@ set test "Tab should complete hostnames"
 set hosts {}
 foreach h [exec bash -c "compgen -A hostname"] {
     lappend hosts $h
-}; # foreach
+}
 assert_complete $hosts "xhost " $test
 
 
@@ -33,8 +33,8 @@ foreach h [exec bash -c "compgen -A hostname"] {
         # Only append hostname if starting with $char
     if {[string range $h 0 0] == "$char"} {
         lappend hosts $h
-    }; # if
-}; # foreach
+    }
+}
 assert_complete $hosts "xhost $char" $test
 
 
@@ -46,7 +46,7 @@ set test "Tab should complete hostnames prefixed with +"
 set hosts {}
 foreach h [exec bash -c "compgen -A hostname"] {
     lappend hosts "+$h"
-}; # foreach
+}
 assert_complete $hosts "xhost \+" $test
 
 
@@ -61,8 +61,8 @@ foreach h [exec bash -c "compgen -A hostname"] {
         # Only append hostname if starting with $char
     if {[string range $h 0 0] == "$char"} {
         lappend hosts "+$h"
-    }; # if
-}; # foreach
+    }
+}
 assert_complete $hosts "xhost +$char"
 
 
@@ -74,7 +74,7 @@ set test "Tab should complete hostnames prefixed with -"
 set hosts {}
 foreach h [exec bash -c "compgen -A hostname"] {
     lappend hosts "-$h"
-}; # foreach
+}
 assert_complete $hosts "xhost -" $test
 
 
@@ -89,8 +89,8 @@ foreach h [exec bash -c "compgen -A hostname"] {
         # Only append hostname if starting with $char
     if {[string range $h 0 0] == "$char"} {
         lappend hosts "-$h"
-    }; # if
-}; # foreach
+    }
+}
 assert_complete $hosts "xhost -$char" $test
 
 
diff --git a/test/lib/completions/xmllint.exp b/test/lib/completions/xmllint.exp
index 15451471..20daab6d 100644
--- a/test/lib/completions/xmllint.exp
+++ b/test/lib/completions/xmllint.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xmlwf.exp b/test/lib/completions/xmlwf.exp
index a996d458..6c306f34 100644
--- a/test/lib/completions/xmlwf.exp
+++ b/test/lib/completions/xmlwf.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xmms.exp b/test/lib/completions/xmms.exp
index c4ad64e8..1f1f6d57 100644
--- a/test/lib/completions/xmms.exp
+++ b/test/lib/completions/xmms.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xpovray.exp b/test/lib/completions/xpovray.exp
index 92cc903d..53a5fcd0 100644
--- a/test/lib/completions/xpovray.exp
+++ b/test/lib/completions/xpovray.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xrandr.exp b/test/lib/completions/xrandr.exp
index 649ed43b..14beb762 100644
--- a/test/lib/completions/xrandr.exp
+++ b/test/lib/completions/xrandr.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xsltproc.exp b/test/lib/completions/xsltproc.exp
index 2470c22e..2c558ff1 100644
--- a/test/lib/completions/xsltproc.exp
+++ b/test/lib/completions/xsltproc.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xvnc4viewer.exp b/test/lib/completions/xvnc4viewer.exp
index 3456c3e7..b10e272c 100644
--- a/test/lib/completions/xvnc4viewer.exp
+++ b/test/lib/completions/xvnc4viewer.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/xz.exp b/test/lib/completions/xz.exp
index 820b0689..83b1f350 100644
--- a/test/lib/completions/xz.exp
+++ b/test/lib/completions/xz.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ypcat.exp b/test/lib/completions/ypcat.exp
index f1bd0c0e..a8249dc2 100644
--- a/test/lib/completions/ypcat.exp
+++ b/test/lib/completions/ypcat.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/ypmatch.exp b/test/lib/completions/ypmatch.exp
index f1695f67..ac264c18 100644
--- a/test/lib/completions/ypmatch.exp
+++ b/test/lib/completions/ypmatch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/yum-arch.exp b/test/lib/completions/yum-arch.exp
index defb7bf4..85c47c22 100644
--- a/test/lib/completions/yum-arch.exp
+++ b/test/lib/completions/yum-arch.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/completions/yum.exp b/test/lib/completions/yum.exp
index 09d7282c..899ecddb 100644
--- a/test/lib/completions/yum.exp
+++ b/test/lib/completions/yum.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified
-}; # teardown()
+}
 
 
 setup
diff --git a/test/lib/library.exp b/test/lib/library.exp
index c76d9854..a79ec526 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -22,7 +22,7 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
     if {[string length $aCmd] != 0} {
         send "$aCmd\r"
         expect -ex "$aCmd\r\n"
-    }; # if
+    }
     if {[string length $title] == 0} {set title $aCmd}
     expect -ex $prompt
     set results $expect_out(buffer);  # Catch output
@@ -35,9 +35,9 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
     if {$out == -1 && [string length $results] > 0} {
         if {[info exists multipass_name]} {
             fail "ERROR Unexpected output from bash command \"$title\""
-        }; # if
+        }
         send_user "ERROR Unexpected output from bash command \"$title\":\n$results"
-    }; # if
+    }
 
     set cmd "echo $?"
     send "$cmd\r"
@@ -46,11 +46,11 @@ proc assert_bash_exec {{aCmd ""} {title ""} {prompt /@} {out -1}} {
         $prompt {
             if {[info exists multipass_name]} {
                 fail "ERROR executing bash command \"$title\""
-            }; # if
+            }
             send_user "ERROR executing bash command \"$title\""
         }
-    }; # expect
-}; # assert_bash_exec()
+    }
+}
 
 
 # Test `type ...' in bash
@@ -64,10 +64,10 @@ proc assert_bash_type {command} {
     expect {
         -ex 0 { set result true }
         -ex 1 { set result false; unsupported "$test" }
-    }; # expect
+    }
     expect "/@"
     return $result
-}; # assert_bash_type()
+}
 
 
 # Make sure the expected list is returned by executing the specified command.
@@ -103,7 +103,7 @@ proc assert_bash_list_dir {expected cmd dir {test ""} {prompt /@} {size 20}} {
     assert_bash_list $expected $cmd $test $prompt $size
     sync_after_int $prompt
     assert_bash_exec {cd "$TESTDIR"}
-}; # assert_bash_list_dir()
+}
 
 
 # Make sure the expected items are returned by TAB-completing the specified
@@ -140,23 +140,23 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
                         # Assume last word of `$cmd' is word to complete on.
                     set index [expr [llength $words] - 1]
                     set cur [lindex $words $index]
-                }; # if
+                }
                     # Remove second word from beginning of single item $expected
                 if {[string first $cur $expected] == 0} {
                     set expected [list [string range $expected [string length $cur] end]]
-                }; # if
-            }; # if
+                }
+            }
         } else {
             expect -ex "$cmd\r\n"
             # Make sure expected items are unique
             set expected [lsort -unique $expected]
-        }; # if
+        }
 
         if {[lsearch -exact $filters "ltrim_colon_completions"] != -1} {
                 # If partial contains colon (:), remove partial from begin of items
                 # See also: bash_completion.__ltrim_colon_completions()
             _ltrim_colon_completions cword expected
-        }; # if
+        }
 
         if {[match_items $expected $test $prompt $size]} {
             if {[llength $expected] == 1} {
@@ -169,7 +169,7 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
                     set cmd2 $cmd
                 } else {
                     set cmd2 [_remove_cword_from_cmd $cmd $cword]
-                }; # if
+                }
 
                 # Determine common prefix of completions
                 set common [::textutil::string::longestCommonPrefixList $expected]
@@ -178,13 +178,13 @@ proc assert_complete {expected cmd {test ""} {prompt /@} {size 20} {cword ""} {f
                     -ex "$prompt$cmd2$common" { pass "$test" }
                     -re $prompt { unresolved "$test at prompt" }
                     -re eof { unresolved "eof" }
-                }; # expect
-            }; # if
+                }
+            }
         } else {
             fail "$test"
-        }; # if
-    }; # if
-}; # assert_complete()
+        }
+    }
+}
 
 
 # @param string $cmd  Command to remove cword from
@@ -203,7 +203,7 @@ proc _remove_cword_from_cmd {cmd {cword ""}} {
         # Remove $cword from end of $cmd
         if {[string last $cword $cmd] == [string length $cmd] - [string length $cword]} {
             set cmd2 [string range $cmd 0 [expr [string last $cword $cmd] - 1]]
-        }; # if
+        }
     } else {
         # No, $cword not specified;
         # Check if last argument is really an-argument-to-complete, i.e.
@@ -217,10 +217,10 @@ proc _remove_cword_from_cmd {cmd {cword ""}} {
             # Remove argument-to-complete from end of $cmd
             set cmd2 [lrange [split $cmd] 0 end-1]
             append cmd2 " "
-        }; # if
-    }; # if
+        }
+    }
     return $cmd2
-}; # _remove_cword_from_cmd()
+}
 
 
 # Escape regexp special characters
@@ -253,8 +253,8 @@ proc assert_complete_any {cmd {test ""} {prompt /@}} {
         }
         -re $prompt { unresolved "$test at prompt" }
         eof { unresolved "eof" }
-    }; # expect
-}; # assert_complete_any()
+    }
+}
 
 
 # Make sure the expected files are returned by TAB-completing the
@@ -273,7 +273,7 @@ proc assert_complete_dir {expected cmd dir {test ""} {size 20} {cword ""}} {
     assert_complete $expected $cmd $test $prompt $size $cword
     sync_after_int $prompt
     assert_bash_exec {cd "$TESTDIR"}
-}; # assert_complete_dir
+}
     
 
 
@@ -304,11 +304,11 @@ proc assert_complete_partial {expected cmd {partial ""} {test ""} {prompt /@} {s
                 # Only append item if starting with $partial
             if {[string range $item 0 [expr [string length $partial] - 1]] == "$partial"} {
                 lappend pick $item
-            }; # if
-        }; # foreach
+            }
+        }
         assert_complete $pick "$cmd $partial" $test $prompt $size $partial $filters
-    }; # if
-}; # assert_complete_partial()
+    }
+}
 
 
 # See also: bash_completion._ltrim_colon_completions
@@ -329,11 +329,11 @@ proc _ltrim_colon_completions {cword items} {
             if {[string first $cword_out $item] == 0} {
                 # Strip colon-prefix
                 lset items_out $i [string range $item [string length $cword_out] end]
-            }; # if
-        }; # for
+            }
+        }
         #set cword_out ""
-    }; # if
-}; # _ltrim_colon_completions()
+    }
+}
 
 
 # Make sure the bash environment hasn't changed between now and the last call
@@ -370,7 +370,7 @@ proc assert_env_unmodified {{sed ""} {file ""} {diff ""}} {
         append diff "\r\n"
     } else {
         set diff ""
-    }; # if
+    }
 
         # Execute diff
 
@@ -392,11 +392,11 @@ proc assert_env_unmodified {{sed ""} {file ""} {diff ""}} {
             # Remove possible `\r\n[wd]@' from end of diff
             if {[string last "\r\n[wd]@" $diff] == [string length $diff] - [string length "\r\n[wd]@"]} {
                 set diff [string range $diff 0 [expr [string last "\r\n[wd]@" $diff] - 1]]
-            }; # if
+            }
             send_user $diff;
         }
-    }; # expect
-}; # assert_env_unmodified()
+    }
+}
 
 
 # Make sure the specified command executed from within Tcl/Expect.
@@ -426,10 +426,10 @@ proc assert_exec {cmd {stdout ''} {test ''} {failcmd "unresolved"}} {
             unsupported "$test"
         } else {
             $failcmd "$test"
-        }; # if
-    }; # if
+        }
+    }
     return $result
-}; # assert_exec()
+}
 
 
 # Check that no completion is attempted on a certain command.
@@ -439,7 +439,7 @@ proc assert_exec {cmd {stdout ''} {test ''} {failcmd "unresolved"}} {
 proc assert_no_complete {{cmd} {test ""}} {
     if {[string length $test] == 0} {
         set test "$cmd shouldn't complete"
-    }; # if
+    }
 
     send "$cmd\t"
     expect -ex "$cmd"
@@ -451,8 +451,8 @@ proc assert_no_complete {{cmd} {test ""}} {
         -re "^$endguard$" { pass "$test" }
         default { fail "$test" }
         timeout { fail "$test" }
-    }; # expect
-}; # assert_no_complete()
+    }
+}
 
 
 # Check that no output is generated on a certain command.
@@ -510,7 +510,7 @@ proc get_known_hosts {{cword ''}} {
     assert_bash_exec "_known_hosts_real '$cword'; echo_array COMPREPLY" \
         {} /@ result
     return $result
-}; # get_known_hosts()
+}
 
 
 # Get hostnames
@@ -524,9 +524,9 @@ proc get_hosts {} {
     set avahi_hosts [get_hosts_avahi]
     if {[llength $avahi_hosts] > 0} {
         lappend hosts $avahi_hosts
-    }; # if
+    }
     return $hosts
-}; # get_hosts()
+}
 
 
 # Get hostnames according to avahi
@@ -540,9 +540,9 @@ proc get_hosts_avahi {} {
         # No, retrieving hosts yields error;
             # Reset hosts
         set hosts {}
-    }; # if
+    }
     return $hosts
-}; # get_hosts_avahi()
+}
 
 
 # Get signals
@@ -558,10 +558,10 @@ proc get_signals {} {
             set signal [string range $signal 3 end]
                 # Add signal (with dash (-) prefix) to list
             lappend signals -$signal
-        }; # if
-    }; # foreach
+        }
+    }
     return $signals
-}; # get_signals()
+}
 
 
 # Initialize tcl globals with bash variables
@@ -572,7 +572,7 @@ proc init_tcl_bash_globals {} {
     set BASH_VERSINFO [eval list $BASH_VERSINFO]
     assert_bash_exec {printf "%s" "$BASH_VERSION"} "" /@ BASH_VERSION
     assert_bash_exec {printf "%s" "$TESTDIR"} "" /@ TESTDIR
-}; # init_tcl_bash_globals()
+}
 
 
 # Check whether completion is installed for the specified command by executing
@@ -590,13 +590,13 @@ proc is_bash_completion_installed_for {command} {
     }
     expect "/@"
     return $result
-}; # is_bash_completion_installed_for()
+}
 
 
 # Detect if test suite is running under Cygwin/Windows
 proc is_cygwin {} {
     expr {[string first [string tolower [exec uname -s]] cygwin] >= 0}
-}; # is_cygwin()
+}
 
 
 # Expect items.
@@ -615,7 +615,7 @@ proc match_items {items test {prompt /@} {size 20}} {
             _escape_regexp_chars item
             append expected $item
             if {[llength $items] > 1} {append expected {\s+}};
-        }; # for
+        }
         if {[llength $items] == 1} {
             expect {
                 -re "^$expected\r\n$" { set result true }
@@ -625,17 +625,17 @@ proc match_items {items test {prompt /@} {size 20}} {
                 "\r\n" { set result false; break }
                 default { set result false; break }
                 timeout { set result false; break }
-            }; # expect
+            }
         } else {
             expect {
                 -re "^$expected" { set result true }
                 default { set result false; break }
                 timeout { set result false; break }
-            }; # expect
-        }; # if
-    }; # for
+            }
+        }
+    }
     return $result
-}; # match_items()
+}
 
 
 
@@ -651,10 +651,10 @@ proc realcommand {cmd} {
             set result [exec readlink -f $path]
         } else {
             set result $path
-        }; # if
-    }; # if
+        }
+    }
     return $result
-}; # realcommand()
+}
 
 
 # Generate filename to save environment to.
@@ -674,10 +674,10 @@ proc gen_env_filename {{file ""} {seq 1}} {
             # Remove possible '.exp' suffix from filename
         if {[string last ".exp" $file] == [string length $file] - [string length ".exp"]} {
             set file [string range $file 0 [expr [string last ".exp" $file] - 1]]
-        }; # if
-    }; # if
+        }
+    }
     return "\$TESTDIR/tmp/$file.env$seq~"
-}; # gen_env_filename()
+}
 
 
 # Save the environment for later comparison
@@ -685,7 +685,7 @@ proc gen_env_filename {{file ""} {seq 1}} {
 #                      `gen_env_filename()'.
 proc save_env {{file ""}} {
     _save_env [gen_env_filename $file 1]
-}; # save_env()
+}
 
 
 # Save the environment for later comparison
@@ -693,7 +693,7 @@ proc save_env {{file ""}} {
 # @see assert_env_unmodified()
 proc _save_env {{file ""}} {
     assert_bash_exec "{ set; declare -F; shopt -p; } > \"$file\""
-}; # _save_env()
+}
 
 
 # Source bash_completion package
@@ -702,7 +702,7 @@ proc source_bash_completion {} {
     assert_bash_exec {BASH_COMPLETION_COMPAT_DIR=$BASH_COMPLETION_DIR}
     assert_bash_exec {BASH_COMPLETION=$(cd "$TESTDIR/.."; pwd)/bash_completion}
     assert_bash_exec {source "$BASH_COMPLETION"}
-}; # source_bash_completion()
+}
 
 
 # Split line into words, disregarding backslash escapes (e.g. \b (backspace),
@@ -727,7 +727,7 @@ proc split_words_bash {line} {
             set part [string range $part 0 [expr [string length $part] - [string length "\\"] - 1]]
             # Indicate glue on next run
             set glue_next true
-        }; # if
+        }
         # Must `part' be appended to latest word (= glue)?
         if {[llength $words] > 0 && [string is true $glue]} {
             # Yes, join `part' to latest word;
@@ -738,11 +738,11 @@ proc split_words_bash {line} {
             # No, don't append word to latest word;
             # Append `part' as separate word
             lappend words $part
-        }; # if
+        }
         set glue $glue_next
-    }; # foreach
+    }
     return $words
-}; # split_words_bash()
+}
 
 
 # Given a list of items this proc finds a (part, full) pair so that when
@@ -826,7 +826,7 @@ proc start_bash {} {
     # for bash < 3.2.41.
     # -- FVu, Tue Sep 15 22:52:00 CEST 2009
     assert_bash_exec {is_bash_version_minimal 3 2 41 || set +o history}
-}; # start_bash()
+}
 
 
 # Redirect xtrace output to a file.
@@ -896,7 +896,7 @@ proc sync_after_tab {} {
         #       installed, so that "^$cdm.*$" doesn't match too early - before
         #       comp_install has finished
     sleep .4
-}; # sync_after_tab()
+}
 
 
 # Return current working directory with `TESTDIR' stripped
@@ -905,4 +905,4 @@ proc wd {} {
     global TESTDIR
         # Remove `$TESTDIR' prefix from current working directory
     set wd [string replace [pwd] 0 [expr [string length $TESTDIR] - 1]]/
-}; # wd()
+}
diff --git a/test/unit/__expand_tilde_by_ref.exp b/test/unit/__expand_tilde_by_ref.exp
index d4a75d11..000d3516 100644
--- a/test/unit/__expand_tilde_by_ref.exp
+++ b/test/unit/__expand_tilde_by_ref.exp
@@ -8,14 +8,14 @@ proc setup {home user} {
     set _home [string trim $_home]
     assert_bash_exec {echo "$USER"} {} /@ _user
     set _user [string trim $_user]
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {
         /var=/d
     }
-}; # teardown()
+}
 
 
 setup home user
diff --git a/test/unit/_count_args.exp b/test/unit/_count_args.exp
index da61bdb6..a1419481 100644
--- a/test/unit/_count_args.exp
+++ b/test/unit/_count_args.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     assert_bash_exec {unset COMP_CWORD COMP_LINE COMP_POINT COMP_WORDS}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -12,7 +12,7 @@ proc teardown {} {
         d
         }
     }
-}; # teardown()
+}
 
 
 setup
diff --git a/test/unit/_get_comp_words_by_ref.exp b/test/unit/_get_comp_words_by_ref.exp
index 22561e7f..c88ad6f6 100644
--- a/test/unit/_get_comp_words_by_ref.exp
+++ b/test/unit/_get_comp_words_by_ref.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     assert_bash_exec {unset COMP_CWORD COMP_LINE COMP_POINT COMP_WORDS}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -15,7 +15,7 @@ proc teardown {} {
             d
         }
     }
-}; # teardown()
+}
 
 
 setup
@@ -105,7 +105,7 @@ if {
     set cmd {COMP_WORDS=(a "'" b c); COMP_CWORD=3}
 } else {
     set cmd {COMP_WORDS=(a "'b c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a 'b c"; COMP_POINT=6; _get_comp_words_by_ref cur prev; echo "$cur $prev"}
 send "$cmd\r"
 expect -ex "$cmd\r\n"
@@ -118,7 +118,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
@@ -133,7 +133,7 @@ if {
     set cmd {COMP_WORDS=(a "\"" b c); COMP_CWORD=3}
 } else {
     set cmd {COMP_WORDS=(a "\"b c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a \"b c"; COMP_POINT=6}
 assert_bash_exec $cmd
 set cmd {_get_comp_words_by_ref cur prev; echo "$cur $prev"};
@@ -148,7 +148,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
@@ -161,7 +161,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
 } else {
     set cmd {add_comp_wordbreak_char :; COMP_WORDS=(a b : c); COMP_CWORD=3}
     set expected {"c :"}
-}; # if
+}
 append cmd {; COMP_LINE='a b:c'; COMP_POINT=5}
 # NOTE: Split-send cmd to prevent backspaces (\008) in output
 assert_bash_exec $cmd $test
@@ -177,7 +177,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a "b:c"); COMP_CWORD=1}
 } else {
     set cmd {COMP_WORDS=(a b : c); COMP_CWORD=3}
-}; # if
+}
 append cmd {; COMP_LINE='a b:c'; COMP_POINT=5}
 assert_bash_exec $cmd $test
 set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
@@ -192,7 +192,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a b c:); COMP_CWORD=2}
 } else {
     set cmd {COMP_WORDS=(a b c :); COMP_CWORD=3}
-}; # if
+}
 append cmd {; COMP_LINE='a b c:'; COMP_POINT=6}
 assert_bash_exec $cmd $test
 set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
@@ -217,7 +217,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a "b::"); COMP_CWORD=1}
 } else {
     set cmd {COMP_WORDS=(a b ::); COMP_CWORD=2}
-}; # if
+}
 append cmd {; COMP_LINE='a b::'; COMP_POINT=5}
 assert_bash_exec $cmd
 set cmd {_get_comp_words_by_ref -n : cur prev; echo "$cur $prev"}
@@ -256,7 +256,7 @@ if {[lindex $::BASH_VERSINFO] <= 3} {
 } else {
     set cmd {COMP_WORDS=(a b = c); COMP_CWORD=3}
     set expected c
-}; # if
+}
 append cmd {; COMP_LINE='a b=c'; COMP_POINT=5}
 assert_bash_exec $cmd
 set cmd {_get_comp_words_by_ref cur prev; echo "$cur"}
@@ -286,7 +286,7 @@ expect {
     -ex "\$(b c/@" { pass "$test" }
     # Expected failure on bash-4
     -ex "c/@" { xfail "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -303,7 +303,7 @@ expect {
     -ex "\$(b c\\ d/@" { pass "$test" }
     # Expected failure on bash-4
     -ex "c\\ d/@" { xfail "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -318,7 +318,7 @@ if {
     set cmd {COMP_WORDS=(a "'" b "&" c); COMP_CWORD=4}
 } else {
     set cmd {COMP_WORDS=(a "'b&c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a 'b&c"; COMP_POINT=6}
 assert_bash_exec $cmd
 set cmd {_get_comp_words_by_ref cur prev; printf %s "$cur"}
@@ -333,7 +333,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/unit/_get_cword.exp b/test/unit/_get_cword.exp
index 1e6e9bfb..c3fbe2ae 100644
--- a/test/unit/_get_cword.exp
+++ b/test/unit/_get_cword.exp
@@ -1,7 +1,7 @@
 proc setup {} {
     assert_bash_exec {unset COMP_CWORD COMP_LINE COMP_POINT COMP_WORDS}
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -12,7 +12,7 @@ proc teardown {} {
         d
         }
     }
-}; # teardown()
+}
 
 
 setup
@@ -105,7 +105,7 @@ if {
     set cmd {COMP_WORDS=(a "'" b c); COMP_CWORD=3}
 } else {
     set cmd {COMP_WORDS=(a "'b c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a 'b c"; COMP_POINT=6; _get_cword}
 send "$cmd\r"
 expect -ex "$cmd\r\n"
@@ -118,7 +118,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
@@ -133,7 +133,7 @@ if {
     set cmd {COMP_WORDS=(a "\"" b c); COMP_CWORD=3}
 } else {
     set cmd {COMP_WORDS=(a "\"b c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a \"b c"; COMP_POINT=6; _get_cword};
 send "$cmd\r"
 expect -ex "$cmd\r\n"
@@ -146,7 +146,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
@@ -159,7 +159,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
 } else {
     set cmd {add_comp_wordbreak_char :; COMP_WORDS=(a b : c); COMP_CWORD=3}
     set expected c
-}; # if
+}
 append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword}
 assert_bash_list $expected $cmd $test
 
@@ -172,7 +172,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a "b:c"); COMP_CWORD=1}
 } else {
     set cmd {COMP_WORDS=(a b : c); COMP_CWORD=3}
-}; # if
+}
 append cmd {; COMP_LINE='a b:c'; COMP_POINT=5; _get_cword :}
 assert_bash_list b:c $cmd $test
 
@@ -185,7 +185,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a b c:); COMP_CWORD=2}
 } else {
     set cmd {COMP_WORDS=(a b c :); COMP_CWORD=3}
-}; # if
+}
 append cmd {; COMP_LINE='a b c:'; COMP_POINT=6; _get_cword :}
 assert_bash_list c: $cmd $test
 
@@ -206,7 +206,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
     set cmd {COMP_WORDS=(a "b::"); COMP_CWORD=1}
 } else {
     set cmd {COMP_WORDS=(a b ::); COMP_CWORD=2}
-}; # if
+}
 append cmd {; COMP_LINE='a b::'; COMP_POINT=5; _get_cword :}
 assert_bash_list b:: $cmd $test
 
@@ -239,7 +239,7 @@ if {[lindex $::BASH_VERSINFO] <= 3} {
 } else {
     set cmd {COMP_WORDS=(a b = c); COMP_CWORD=3}
     set expected c
-}; # if
+}
 append cmd {; COMP_LINE='a b=c'; COMP_POINT=5; _get_cword}
 assert_bash_list $expected $cmd $test
 
@@ -264,7 +264,7 @@ expect {
     -ex "\$(b c/@" { pass "$test" }
     # Expected failure on bash-4
     -ex "c/@" { xfail "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -279,7 +279,7 @@ expect {
     -ex "\$(b c\\ d/@" { pass "$test" }
     # Expected failure on bash-4
     -ex "c\\ d/@" { xfail "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -294,7 +294,7 @@ if {
     set cmd {COMP_WORDS=(a "'" b "&" c); COMP_CWORD=4}
 } else {
     set cmd {COMP_WORDS=(a "'b&c"); COMP_CWORD=1}
-}; # if
+}
 append cmd {; COMP_LINE="a 'b&c"; COMP_POINT=6; _get_cword}
 send "$cmd\r"
 expect -ex "$cmd\r\n"
@@ -307,7 +307,7 @@ expect {
             [lindex $::BASH_VERSINFO 2] < 35
         } {xfail "$test"} {fail "$test"}
     }
-}; # expect
+}
 
 
 sync_after_int
diff --git a/test/unit/_known_hosts_real.exp b/test/unit/_known_hosts_real.exp
index 152cf885..31842792 100644
--- a/test/unit/_known_hosts_real.exp
+++ b/test/unit/_known_hosts_real.exp
@@ -1,6 +1,6 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
@@ -8,7 +8,7 @@ proc teardown {} {
         /COMPREPLY=/d
         /OLDHOME=/d
     }
-}; # teardown()
+}
 
 
 setup
@@ -35,7 +35,7 @@ set hosts [lsort -ascii $hosts]
 set expected {}
 foreach host $hosts {
     lappend expected "user@$host:"
-}; # foreach
+}
     # Call _known_hosts
 set cmd {unset COMPREPLY; _known_hosts_real -acF fixtures/_known_hosts_real/config 'user@'; echo_array COMPREPLY}
 assert_bash_list $expected $cmd $test
@@ -66,7 +66,7 @@ expect {
     -re "^$hosts_config\r\n/@$"  { fail "$test (known hosts file)" }
     -re /@ { unresolved "$test at prompt" }
     default { unresolved "$test" }
-}; # expect
+}
 
 
 sync_after_int
@@ -89,7 +89,7 @@ expect -ex "$cmd\r\n"
 expect {
     -re "^$hosts\r\n/@$"  { pass "$test" }
     default { unresolved "$test" }
-}; # expect
+}
     # Teardown environment
 set cmd {HOME=$OLDHOME}
 send "$cmd\r"
diff --git a/test/unit/compgen.exp b/test/unit/compgen.exp
index 6673bf0e..8596cfa5 100644
--- a/test/unit/compgen.exp
+++ b/test/unit/compgen.exp
@@ -1,11 +1,11 @@
 proc setup {} {
     save_env
-}; # setup()
+}
 
 
 proc teardown {} {
     assert_env_unmodified {/OLDPWD/d}
-}; # teardown()
+}
 
 
 setup
@@ -17,7 +17,7 @@ if {[lindex $::BASH_VERSINFO 0] <= 3} {
 } else {
     set test {compgen -f a\\\'b/ on bash-4 should return a\'b/c};
     set cmd {compgen -f a\\\'b/}
-}; # if
+}
 set dir fixtures/compgen
 set prompt "/$dir/@"
 assert_bash_exec "cd $dir" "" $prompt
@@ -39,7 +39,7 @@ expect {
     }
     -re $prompt { pass "$test" }
     -re eof { unresolved "eof" }
-}; # expect
+}
 sync_after_int $prompt
 assert_bash_exec {cd "$TESTDIR"}