diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index 0a874da3..d53e7d44 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,7 +13,7 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 630,
+  BUILD_REVISION => 631,
   BUILD_DATE     => "2014-06-11",
 };
 
diff --git a/modules/c2english/CGrammar.pm b/modules/c2english/CGrammar.pm
index 5ea61d61..5d63a02e 100644
--- a/modules/c2english/CGrammar.pm
+++ b/modules/c2english/CGrammar.pm
@@ -979,9 +979,6 @@ primary_expression:
     | constant
     | string 
     | identifier
-          {
-            $return = "$item{identifier}";
-          }
 
 declarator:
       direct_declarator
@@ -1108,7 +1105,6 @@ DAD: # macro for direct_abstract_declarator
 
 identifier: 
       ...!reserved identifier_word
-          { $return = $item{identifier_word}; }
 
 pointer:
       '*' type_qualifier_list(s) pointer(?) 
@@ -1303,9 +1299,7 @@ enumerator:
 
 comment:
       comment_c 
-          { $return = $item{comment_c}; }
     | comment_cxx
-          { $return = $item{comment_cxx}; }
 
 comment_c:
       m{/\*[^*]*\*+([^/*][^*]*\*+)*/}s
@@ -1323,6 +1317,7 @@ comment_cxx:
             $return = $item[1]; 
             $return =~ s|^//\s*||;
             $return =~ s/\n*$//;
+            $return =~ s/"/\\"/g;
             $return = "\nQuick comment: \"$return\".\n";
           }