diff -r 87de63b19e4c -r 04fdb4abf120 tool/main.cpp
--- a/tool/main.cpp	Tue Dec 14 21:58:53 2010 +0100
+++ b/tool/main.cpp	Mon Dec 20 17:52:37 2010 +0100
@@ -312,7 +312,7 @@
                     cmd->execute(commandArgs);
                 } catch (InvalidUsageException &e) {
                     cerr << e.what() << endl << endl;
-                    cerr << binaryBaseName << " " << cmd->helpString();
+                    cerr << cmd->helpString(binaryBaseName);
                     retval = 1;
                 } catch (CommandException &e) {
                     cerr << e.what() << endl;
@@ -322,7 +322,7 @@
                     retval = 1;
                 }
             } else {
-                cout << binaryBaseName << " " << cmd->helpString();
+                cout << cmd->helpString(binaryBaseName);
             }
         } else {
             cerr << "Ambiguous command abbreviation! Matching:" << endl;