diff --git a/src/Context.cpp b/src/Context.cpp
index 68a04ebe2..11dce4a8b 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -381,8 +381,7 @@ int Context::run ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// Locate and dispatch to the command whose keyword matches via autoComplete
-// with the earliest argument.
+// Dispatch to the command found by the parser.
 int Context::dispatch (std::string &out)
 {
   // Autocomplete args against keywords.
diff --git a/src/Parser.cpp b/src/Parser.cpp
index ba82087cc..9eae2e256 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -144,13 +144,21 @@ Tree* Parser::tree ()
 ////////////////////////////////////////////////////////////////////////////////
 Tree* Parser::parse ()
 {
+  findBinary ();
   findTerminator ();
+
+  findOverrides ();
+  applyOverrides ();
+
   findSubstitution ();
   findPattern ();
   findTag ();
   findAttribute ();
   findAttributeModifier ();
   findOperator ();
+  findCommand ();
+  findUUIDList ();
+  findIdSequence ();
   findFilter ();
   findModifications ();