diff --git a/src/Context.cpp b/src/Context.cpp
index 7f3d3629b..c44e51576 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -85,7 +85,11 @@ int Context::initialize (int argc, const char** argv)
 
     // Initialize the command line parser.
     a3t.initialize (argc, argv);
-    Tree* parseTree = a3t.parse ();
+
+    // TODO Uncommenting this breaks unit tests because of the errors it
+    //      generates.
+    Tree* parseTree = NULL;
+    //Tree* parseTree = a3t.parse ();
 
     // END EXPERIMENTAL CODE
 
diff --git a/src/parser/args.cpp b/src/parser/args.cpp
index 1da3ab898..a4e9e5669 100644
--- a/src/parser/args.cpp
+++ b/src/parser/args.cpp
@@ -71,6 +71,10 @@ int main (int argc, const char** argv)
     // Helper commands.
     a3t.entity ("helper",     "_get");
     a3t.entity ("helper",     "_query");
+    a3t.entity ("helper",     "_ids");
+    a3t.entity ("helper",     "_uuids");
+    a3t.entity ("helper",     "_zshids");
+    a3t.entity ("helper",     "_zshuuids");
 
     // Attributes (columns).
     a3t.entity ("attribute",  "description");