diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index be20a51c..ed9cff4d 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,8 +13,8 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 496,
-  BUILD_DATE     => "2014-03-03",
+  BUILD_REVISION => 497,
+  BUILD_DATE     => "2014-03-04",
 };
 
 1;
diff --git a/modules/expand_macros.pl b/modules/expand_macros.pl
index 8539e98e..4093c1b7 100755
--- a/modules/expand_macros.pl
+++ b/modules/expand_macros.pl
@@ -21,7 +21,6 @@ if($#ARGV < 1) {
   exit 0;
 }
 
-my $nick = shift @ARGV;
 my $code = join ' ', @ARGV;
 my $lang = 'C89';
 my $args = "";
@@ -301,9 +300,9 @@ if(not $has_main) {
   $result =~ s/\s*}\s*$//;
 }
 
-$output = $result;
+$output = length $result ? $result : $nooutput;
 
-print "$nick: $output\n";
+print "$output\n";
 
 sub execute {
   my $timeout = shift @_;
diff --git a/modules/paren/paren.py b/modules/paren/paren.py
index e7da2bbd..07afb10a 100755
--- a/modules/paren/paren.py
+++ b/modules/paren/paren.py
@@ -66,17 +66,17 @@ def parenthesize(source):
     try:
         ast = parser.parse(source, '<input>')
     except plyparser.ParseError as e:
-        print("{0}: Error: {1}".format(sys.argv[1], e.args[0]))
+        print("Error: " + e.args[0])
         return
     generator = CGenerator()
-    print("{0}: {1}".format(sys.argv[1], generator.visit(ast)))
+    print(generator.visit(ast))
 
 
 if __name__ == "__main__":
-    if len(sys.argv) > 2:
-        parenthesize(' '.join(sys.argv[2:]).rstrip(';'))
-    elif len(sys.argv) == 2:
-        print(sys.argv[1] + ': ' + "Usage: paren <expression>")
+    if len(sys.argv) > 1:
+        parenthesize(' '.join(sys.argv[1:]).rstrip(';'))
+    elif len(sys.argv) == 1:
+        print("Usage: paren <expression>")
     else:
         print('error')