Expressions

- Corrected interpretation of integers outside the location of a
  sequence as a word.
- Corrected interpretation of uuids outside the location of a
  sequence as a word.

src/Arguments.cpp

@@ -244,19 +244,31 @@ void Arguments::categorize ()
       }
 
       // <id>[-<id>][,...]
-      else if (!found_something_after_sequence &&
+      else if (is_id (arg->first))
-               is_id (arg->first))
       {
-        found_sequence = true;
+        if (!found_something_after_sequence)
-        arg->second = "id";
+        {
+          found_sequence = true;
+          arg->second = "id";
+        }
+        else
+        {
+          arg->second = "word";
+        }
       }
 
       // <uuid>[,...]
-      else if (!found_something_after_sequence &&
+      else if (is_uuid (arg->first))
-               is_uuid (arg->first))
       {
-        found_sequence = true;
+        if (!found_something_after_sequence)
-        arg->second = "uuid";
+        {
+          found_sequence = true;
+          arg->second = "uuid";
+        }
+        else
+        {
+          arg->second = "word";
+        }
       }
 
       // [+-]tag