diff --git a/src/CLI.cpp b/src/CLI.cpp
index bbda45c1d..9e46f5cdc 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -204,8 +204,7 @@ const std::string A::dump () const
 
 ////////////////////////////////////////////////////////////////////////////////
 CLI::CLI ()
-: _program ("")
-, _rc ("")
+: _rc ("")
 , _command ("")
 , _readOnly (false)
 {
@@ -233,7 +232,7 @@ void CLI::entity (const std::string& name, const std::string& value)
 void CLI::initialize (int argc, const char** argv)
 {
   // Clean what needs to be cleaned. Everything in this case.
-  _program = "";
+  _program.clear ();
   _original_args.clear ();
   _args.clear ();
   _rc = "";
@@ -243,7 +242,10 @@ void CLI::initialize (int argc, const char** argv)
   _filter.clear ();
   _modifications.clear ();
 
-  _program = argv[0];
+  _program._name = "arg";
+  _program.attribute ("raw", argv[0]);
+  _program.tag ("BINARY");
+
   for (int i = 1; i < argc; ++i)
     _original_args.push_back (argv[i]);
 
@@ -530,7 +532,8 @@ void CLI::unsweetenTags ()
 void CLI::dump (const std::string& label) const
 {
   std::cout << label << "\n"
-            << "  _program       " << _program << "\n";
+            << "  _program\n"
+            << "    " << _program.dump () << "\n";
 
   std::cout << "  _original_args ";
   Color colorOrigArgs ("gray10 on gray4");
diff --git a/src/CLI.h b/src/CLI.h
index 2899e00f4..9aeb1d541 100644
--- a/src/CLI.h
+++ b/src/CLI.h
@@ -82,7 +82,7 @@ private:
 public:
   std::multimap <std::string, std::string> _entities;
   std::map <std::string, std::string>      _aliases;
-  std::string                              _program;
+  A                                        _program;
   std::vector <std::string>                _original_args;
   std::vector <A>                          _args;
   std::string                              _rc;