Improve the test output a bit.
diff --git a/Lib/cgi.py b/Lib/cgi.py
index fa75929..3b56382 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -850,7 +850,8 @@
     except:
         print_exception()
 
-    # Second try with a small maxlen...
+    print "<H1>Second try with a small maxlen...</H1>"
+
     global maxlen
     maxlen = 50
     try:
@@ -859,7 +860,6 @@
         print_environ(environ)
         print_directory()
         print_arguments()
-        print_environ_usage()
     except:
         print_exception()
 
@@ -895,6 +895,8 @@
     keys.sort()
     print
     print "<H3>Form Contents:</H3>"
+    if not keys:
+        print "<P>No form fields."
     print "<DL>"
     for key in keys:
         print "<DT>" + escape(key) + ":",