diff --git a/src/Context.cpp b/src/Context.cpp
index ccddfb476..ca7a0fbe5 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -221,9 +221,7 @@ int Context::initialize (int argc, const char** argv)
     a3.categorize ();
 
     // Parse the command line.
-    Tree* parseTree = parser.parse ();
-    if (parseTree && config.getBoolean ("debug"))
-      debug (parseTree->dump ());
+    parser.parse ();
 
     // Initialize the database.
     tdb2.set_location (data_dir);
diff --git a/src/Eval.cpp b/src/Eval.cpp
index 668002f7d..5c55b2327 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -157,7 +157,7 @@ void Eval::evaluatePostfixExpression (const std::string& e, Variant& v) const
     tokens.push_back (std::pair <std::string, Lexer::Type> (token, type));
 
   if (_debug)
-    context.debug ("Filter postfix tokens " + dump (tokens));
+    context.debug ("Postfix tokens       " + dump (tokens));
 
   // Call the postfix evaluator.
   evaluatePostfixStack (tokens, v);
@@ -176,7 +176,7 @@ void Eval::compileExpression (const std::string& e)
 
   // Parse for syntax checking and operator replacement.
   if (_debug)
-    context.debug ("Filter infix tokens " + dump (_compiled));
+    context.debug ("Filter infix tokens  " + dump (_compiled));
   infixParse (_compiled);
   if (_debug)
     context.debug ("Filter parsed tokens " + dump (_compiled));
@@ -184,7 +184,7 @@ void Eval::compileExpression (const std::string& e)
   // Convert infix --> postfix.
   infixToPostfix (_compiled);
   if (_debug)
-    context.debug ("Postfix tokens " + dump (_compiled));
+    context.debug ("Postfix tokens       " + dump (_compiled));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -805,8 +805,7 @@ std::string Eval::dump (
 {
   // Set up a color mapping.
   std::map <Lexer::Type, Color> color_map;
-  color_map[Lexer::typeNone]     = Color ("color15 on gray4");
-  color_map[Lexer::typeOperator] = Color ("green on gray4");
+  color_map[Lexer::typeNone]     = Color ("white on green");
 /*
   Lexer::typeOperator
   Lexer::typeNone
@@ -841,7 +840,7 @@ std::string Eval::dump (
     output += c.colorize (i->first);
   }
 
-  return output;
+  return output + "\n";
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Filter.cpp b/src/Filter.cpp
index b03e96dd2..6f3f572dd 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -72,7 +72,6 @@ Filter::~Filter ()
 void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output)
 {
   context.timer_filter.start ();
-
   _startCount = (int) input.size ();
 
   if (context.config.getBoolean ("debug"))
@@ -83,8 +82,6 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
   }
 
   std::string filterExpr = context.parser.getFilterExpression ();
-  context.debug ("\033[1;37;42mFILTER\033[0m " + filterExpr);
-
   if (filterExpr.length ())
   {
     Eval eval;
@@ -132,8 +129,6 @@ void Filter::subset (std::vector <Task>& output)
 
   bool shortcut = false;
   std::string filterExpr = context.parser.getFilterExpression ();
-  context.debug ("\033[1;37;42mFILTER\033[0m " + filterExpr);
-
   if (filterExpr.length ())
   {
     context.timer_filter.stop ();