diff --git a/src/core/model/command-line.cc b/src/core/model/command-line.cc
index 2cd12a78d..734c58502 100644
--- a/src/core/model/command-line.cc
+++ b/src/core/model/command-line.cc
@@ -71,24 +71,8 @@ Encode (const std::string & source)
         case '&':  buffer.append ("&");          break;
         case '\"': buffer.append (""");         break;
         case '\'': buffer.append ("'");         break;
-          // case '>':  buffer.append (">");           break;
-
-        case '<':  {
-          // Special case:
-          // "...blah <file..." is not allowed
-          // "...foo<bar..."  is allowed
-          if (buffer.back () == ' ')
-            {
-              buffer.append ("&lt;");
-            }
-          else
-            {
-              buffer.append ("<");
-            }
-
-          break;
-        }
-
+        case '>':  buffer.append ("&gt;");           break;
+        case '<':  buffer.append ("&lt;");           break;
         default:   buffer.append (&source[pos], 1);  break;
         }
       /* *NS_CHECK_STYLE_ON* */
diff --git a/src/traffic-control/examples/adaptive-red-tests.cc b/src/traffic-control/examples/adaptive-red-tests.cc
index ce1158477..0412a4ba4 100644
--- a/src/traffic-control/examples/adaptive-red-tests.cc
+++ b/src/traffic-control/examples/adaptive-red-tests.cc
@@ -215,9 +215,9 @@ main (int argc, char *argv[])
   CommandLine cmd (__FILE__);
   cmd.AddValue ("testNumber", "Run test 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14 or 15", aredTest);
   cmd.AddValue ("pathOut", "Path to save results from --writeForPlot/--writePcap/--writeFlowMonitor", pathOut);
-  cmd.AddValue ("writeForPlot", "<0/1> to write results for plot (gnuplot)", writeForPlot);
-  cmd.AddValue ("writePcap", "<0/1> to write results in pcapfile", writePcap);
-  cmd.AddValue ("writeFlowMonitor", "<0/1> to enable Flow Monitor and write their results", flowMonitor);
+  cmd.AddValue ("writeForPlot", "Write results for plot (gnuplot)", writeForPlot);
+  cmd.AddValue ("writePcap", "Write results in pcapfile", writePcap);
+  cmd.AddValue ("writeFlowMonitor", "Enable Flow Monitor and write their results", flowMonitor);
 
   cmd.Parse (argc, argv);
   if ((aredTest < 1) || (aredTest == 5) || (aredTest > 15))
diff --git a/src/traffic-control/examples/red-tests.cc b/src/traffic-control/examples/red-tests.cc
index 6a675e8a5..d0c357e11 100644
--- a/src/traffic-control/examples/red-tests.cc
+++ b/src/traffic-control/examples/red-tests.cc
@@ -292,9 +292,9 @@ main (int argc, char *argv[])
   CommandLine cmd (__FILE__);
   cmd.AddValue ("testNumber", "Run test 1, 3, 4 or 5", redTest);
   cmd.AddValue ("pathOut", "Path to save results from --writeForPlot/--writePcap/--writeFlowMonitor", pathOut);
-  cmd.AddValue ("writeForPlot", "<0/1> to write results for plot (gnuplot)", writeForPlot);
-  cmd.AddValue ("writePcap", "<0/1> to write results in pcapfile", writePcap);
-  cmd.AddValue ("writeFlowMonitor", "<0/1> to enable Flow Monitor and write their results", flowMonitor);
+  cmd.AddValue ("writeForPlot", "Write results for plot (gnuplot)", writeForPlot);
+  cmd.AddValue ("writePcap", "Write results in pcapfile", writePcap);
+  cmd.AddValue ("writeFlowMonitor", "Enable Flow Monitor and write their results", flowMonitor);
 
   cmd.Parse (argc, argv);
   if ( (redTest != 1) && (redTest != 3) && (redTest != 4) && (redTest != 5) )