diff --git a/src/Arguments.cpp b/src/Arguments.cpp
index 4d4d3a605..5e8878163 100644
--- a/src/Arguments.cpp
+++ b/src/Arguments.cpp
@@ -150,7 +150,7 @@ void Arguments::capture (int argc, const char** argv)
 {
   for (int i = 0; i < argc; ++i)
   {
-    // The "i != 0" guarantees that argv[0] does not get split, because it may
+    // The "i &&" guarantees that argv[0] does not get split, because it may
     // be an absolute path, and Expression::expand_tokens would make a dog's
     // dinner out of it.
     std::vector <std::string> parts;
diff --git a/src/Expression.cpp b/src/Expression.cpp
index 7bf5cb4f7..1d1822369 100644
--- a/src/Expression.cpp
+++ b/src/Expression.cpp
@@ -647,6 +647,9 @@ void Expression::tokenize (
     else if (n.getDate (date_format, t))
       tokens.push_back (Triple (Date (t).toString (date_format), "date", category));
 
+    else if (n.getWord (s))
+      tokens.push_back (Triple (s, "rvalue", category));
+
     else
     {
       if (! n.getUntilWS (s))