diff --git a/examples/energy/energy-model-example.cc b/examples/energy/energy-model-example.cc
index 9e6d54db6..3b7d6e0a1 100644
--- a/examples/energy/energy-model-example.cc
+++ b/examples/energy/energy-model-example.cc
@@ -132,7 +132,7 @@ main (int argc, char *argv[])
   double startTime = 0.0;       // seconds
   double distanceToRx = 100.0;  // meters
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("Prss", "Intended primary RSS (dBm)", Prss);
   cmd.AddValue ("PpacketSize", "size of application packet sent", PpacketSize);
diff --git a/examples/energy/energy-model-with-harvesting-example.cc b/examples/energy/energy-model-with-harvesting-example.cc
index 50c688fea..ce920d534 100644
--- a/examples/energy/energy-model-with-harvesting-example.cc
+++ b/examples/energy/energy-model-with-harvesting-example.cc
@@ -173,7 +173,7 @@ main (int argc, char *argv[])
   // Energy Harvester variables
   double harvestingUpdateInterval = 1;  // seconds
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("Prss", "Intended primary RSS (dBm)", Prss);
   cmd.AddValue ("PacketSize", "size of application packet sent", PacketSize);
diff --git a/examples/error-model/simple-error-model.cc b/examples/error-model/simple-error-model.cc
index 37782f2fe..3e49d499f 100644
--- a/examples/error-model/simple-error-model.cc
+++ b/examples/error-model/simple-error-model.cc
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Bind()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue("errorModelType", "TypeId of the error model to use", errorModelType);
   cmd.Parse (argc, argv);
 
diff --git a/examples/ipv6/fragmentation-ipv6-two-MTU.cc b/examples/ipv6/fragmentation-ipv6-two-MTU.cc
index 883aecfa6..f9aae347b 100644
--- a/examples/ipv6/fragmentation-ipv6-two-MTU.cc
+++ b/examples/ipv6/fragmentation-ipv6-two-MTU.cc
@@ -47,7 +47,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/examples/ipv6/fragmentation-ipv6.cc b/examples/ipv6/fragmentation-ipv6.cc
index 0d6ba164d..8e28fc327 100644
--- a/examples/ipv6/fragmentation-ipv6.cc
+++ b/examples/ipv6/fragmentation-ipv6.cc
@@ -45,7 +45,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/examples/ipv6/icmpv6-redirect.cc b/examples/ipv6/icmpv6-redirect.cc
index ab9445f03..0bfd79bb4 100644
--- a/examples/ipv6/icmpv6-redirect.cc
+++ b/examples/ipv6/icmpv6-redirect.cc
@@ -57,7 +57,7 @@ int main (int argc, char **argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/examples/ipv6/loose-routing-ipv6.cc b/examples/ipv6/loose-routing-ipv6.cc
index e4fa4e698..5adae0f84 100644
--- a/examples/ipv6/loose-routing-ipv6.cc
+++ b/examples/ipv6/loose-routing-ipv6.cc
@@ -53,7 +53,7 @@ int main (int argc, char **argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/examples/ipv6/ping6.cc b/examples/ipv6/ping6.cc
index 1d6d1c6a2..a718c48b7 100644
--- a/examples/ipv6/ping6.cc
+++ b/examples/ipv6/ping6.cc
@@ -43,7 +43,7 @@ int main (int argc, char **argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/examples/ipv6/radvd-two-prefix.cc b/examples/ipv6/radvd-two-prefix.cc
index 3ee513ec0..e5a5ee9e6 100644
--- a/examples/ipv6/radvd-two-prefix.cc
+++ b/examples/ipv6/radvd-two-prefix.cc
@@ -84,7 +84,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/examples/ipv6/radvd.cc b/examples/ipv6/radvd.cc
index b3dfd2413..c850d8683 100644
--- a/examples/ipv6/radvd.cc
+++ b/examples/ipv6/radvd.cc
@@ -49,7 +49,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/examples/ipv6/wsn-ping6.cc b/examples/ipv6/wsn-ping6.cc
index d41d02662..92ed2f892 100644
--- a/examples/ipv6/wsn-ping6.cc
+++ b/examples/ipv6/wsn-ping6.cc
@@ -47,7 +47,7 @@ int main (int argc, char **argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/examples/matrix-topology/matrix-topology.cc b/examples/matrix-topology/matrix-topology.cc
index e7a1ae940..d6a6b0a37 100644
--- a/examples/matrix-topology/matrix-topology.cc
+++ b/examples/matrix-topology/matrix-topology.cc
@@ -99,7 +99,7 @@ int main (int argc, char *argv[])
   std::string adj_mat_file_name ("examples/matrix-topology/adjacency_matrix.txt");
   std::string node_coordinates_file_name ("examples/matrix-topology/node_coordinates.txt");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   // ---------- End of Simulation Variables ----------------------------------
diff --git a/examples/naming/object-names.cc b/examples/naming/object-names.cc
index eab56ee25..04fe42c3a 100644
--- a/examples/naming/object-names.cc
+++ b/examples/naming/object-names.cc
@@ -44,7 +44,7 @@ main (int argc, char *argv[])
   LogComponentEnable ("ObjectNamesExample", LOG_LEVEL_INFO);
 #endif
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NodeContainer n;
diff --git a/examples/realtime/realtime-udp-echo.cc b/examples/realtime/realtime-udp-echo.cc
index bd4ac21a4..d97d14598 100644
--- a/examples/realtime/realtime-udp-echo.cc
+++ b/examples/realtime/realtime-udp-echo.cc
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults and the above Bind() at
   // run-time, via command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //
diff --git a/examples/routing/dynamic-global-routing.cc b/examples/routing/dynamic-global-routing.cc
index 597dda36f..e18d0f7c6 100644
--- a/examples/routing/dynamic-global-routing.cc
+++ b/examples/routing/dynamic-global-routing.cc
@@ -88,7 +88,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NS_LOG_INFO ("Create nodes.");
diff --git a/examples/routing/global-injection-slash32.cc b/examples/routing/global-injection-slash32.cc
index 4044a1d41..e29556486 100644
--- a/examples/routing/global-injection-slash32.cc
+++ b/examples/routing/global-injection-slash32.cc
@@ -50,7 +50,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nA = CreateObject<Node> ();
diff --git a/examples/routing/global-routing-multi-switch-plus-router.cc b/examples/routing/global-routing-multi-switch-plus-router.cc
index e1bb77b9f..4e9fb8e0d 100644
--- a/examples/routing/global-routing-multi-switch-plus-router.cc
+++ b/examples/routing/global-routing-multi-switch-plus-router.cc
@@ -282,7 +282,7 @@ main (int argc, char *argv[])
   // ----------------------------------------------------------------------
   // Create command line options and get them
   // ----------------------------------------------------------------------
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.Usage    ("NOTE: valid --pcap arguments are: 't2,t3,b2,b3,trlan,trwan,brlan,brwan'");
 
diff --git a/examples/routing/global-routing-slash32.cc b/examples/routing/global-routing-slash32.cc
index daf430b07..de0487c54 100644
--- a/examples/routing/global-routing-slash32.cc
+++ b/examples/routing/global-routing-slash32.cc
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nA = CreateObject<Node> ();
diff --git a/examples/routing/manet-routing-compare.cc b/examples/routing/manet-routing-compare.cc
index 71331cad0..8e469f990 100644
--- a/examples/routing/manet-routing-compare.cc
+++ b/examples/routing/manet-routing-compare.cc
@@ -187,7 +187,7 @@ RoutingExperiment::SetupPacketReceive (Ipv4Address addr, Ptr<Node> node)
 std::string
 RoutingExperiment::CommandSetup (int argc, char **argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("CSVfileName", "The name of the CSV output file name", m_CSVfileName);
   cmd.AddValue ("traceMobility", "Enable mobility tracing", m_traceMobility);
   cmd.AddValue ("protocol", "1=OLSR;2=AODV;3=DSDV;4=DSR", m_protocol);
diff --git a/examples/routing/mixed-global-routing.cc b/examples/routing/mixed-global-routing.cc
index bf4a21120..7697d711b 100644
--- a/examples/routing/mixed-global-routing.cc
+++ b/examples/routing/mixed-global-routing.cc
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NS_LOG_INFO ("Create nodes.");
diff --git a/examples/routing/rip-simple-network.cc b/examples/routing/rip-simple-network.cc
index f8c908659..bdac5e3b0 100644
--- a/examples/routing/rip-simple-network.cc
+++ b/examples/routing/rip-simple-network.cc
@@ -76,7 +76,7 @@ int main (int argc, char **argv)
   bool showPings = false;
   std::string SplitHorizon ("PoisonReverse");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.AddValue ("printRoutingTables", "Print routing tables at 30, 60 and 90 seconds", printRoutingTables);
   cmd.AddValue ("showPings", "Show Ping6 reception", showPings);
diff --git a/examples/routing/ripng-simple-network.cc b/examples/routing/ripng-simple-network.cc
index 1c7178459..dbf7cd850 100644
--- a/examples/routing/ripng-simple-network.cc
+++ b/examples/routing/ripng-simple-network.cc
@@ -76,7 +76,7 @@ int main (int argc, char **argv)
   bool showPings = false;
   std::string SplitHorizon ("PoisonReverse");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.AddValue ("printRoutingTables", "Print routing tables at 30, 60 and 90 seconds", printRoutingTables);
   cmd.AddValue ("showPings", "Show Ping6 reception", showPings);
diff --git a/examples/routing/simple-alternate-routing.cc b/examples/routing/simple-alternate-routing.cc
index 13b2d5971..737742405 100644
--- a/examples/routing/simple-alternate-routing.cc
+++ b/examples/routing/simple-alternate-routing.cc
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   // The below metric, if set to 3 or higher, will cause packets between
   // n1 and n3 to take the 2-hop route through n2
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   // 
   // Additionally, we plumb this metric into the default value / command 
   // line argument system as well, for exemplary purposes.  This means 
diff --git a/examples/routing/simple-global-routing.cc b/examples/routing/simple-global-routing.cc
index 506bd3b74..e9dd65aa3 100644
--- a/examples/routing/simple-global-routing.cc
+++ b/examples/routing/simple-global-routing.cc
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   bool enableFlowMonitor = false;
   cmd.AddValue ("EnableMonitor", "Enable Flow Monitor", enableFlowMonitor);
   cmd.Parse (argc, argv);
diff --git a/examples/routing/simple-routing-ping6.cc b/examples/routing/simple-routing-ping6.cc
index 7c860d9eb..bda8124cb 100644
--- a/examples/routing/simple-routing-ping6.cc
+++ b/examples/routing/simple-routing-ping6.cc
@@ -101,7 +101,7 @@ int main (int argc, char** argv)
   LogComponentEnable ("Ping6Application", LOG_LEVEL_ALL);
 #endif
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   StackHelper stackHelper;
diff --git a/examples/routing/static-routing-slash32.cc b/examples/routing/static-routing-slash32.cc
index d0f429acd..576b295d8 100644
--- a/examples/routing/static-routing-slash32.cc
+++ b/examples/routing/static-routing-slash32.cc
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nA = CreateObject<Node> ();
diff --git a/examples/socket/socket-bound-static-routing.cc b/examples/socket/socket-bound-static-routing.cc
index 0eba0b2f1..4b76b7772 100644
--- a/examples/socket/socket-bound-static-routing.cc
+++ b/examples/socket/socket-bound-static-routing.cc
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nSrc = CreateObject<Node> ();
diff --git a/examples/socket/socket-bound-tcp-static-routing.cc b/examples/socket/socket-bound-tcp-static-routing.cc
index e262fd514..088169d3e 100644
--- a/examples/socket/socket-bound-tcp-static-routing.cc
+++ b/examples/socket/socket-bound-tcp-static-routing.cc
@@ -67,7 +67,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<Node> nSrc = CreateObject<Node> ();
diff --git a/examples/socket/socket-options-ipv4.cc b/examples/socket/socket-options-ipv4.cc
index 74d8f9506..2469d8444 100644
--- a/examples/socket/socket-options-ipv4.cc
+++ b/examples/socket/socket-options-ipv4.cc
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   uint32_t ipTtl = 0;
   bool ipRecvTtl = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("PacketSize", "Packet size in bytes", packetSize);
   cmd.AddValue ("PacketCount", "Number of packets to send", packetCount);
   cmd.AddValue ("Interval", "Interval between packets", packetInterval);
diff --git a/examples/socket/socket-options-ipv6.cc b/examples/socket/socket-options-ipv6.cc
index dca834fad..b5b4e22f5 100644
--- a/examples/socket/socket-options-ipv6.cc
+++ b/examples/socket/socket-options-ipv6.cc
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   uint32_t ipv6Hoplimit = 0;
   bool ipv6RecvHoplimit = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("PacketSize", "Packet size in bytes", packetSize);
   cmd.AddValue ("PacketCount", "Number of packets to send", packetCount);
   cmd.AddValue ("Interval", "Interval between packets", packetInterval);
diff --git a/examples/stats/wifi-example-sim.cc b/examples/stats/wifi-example-sim.cc
index 4a859ff7b..5c8a144a2 100644
--- a/examples/stats/wifi-example-sim.cc
+++ b/examples/stats/wifi-example-sim.cc
@@ -76,7 +76,7 @@ int main (int argc, char *argv[]) {
   }
 
   // Set up command line parameters used to control the experiment.
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("distance", "Distance apart to place nodes (in meters).",
                 distance);
   cmd.AddValue ("format", "Format to use for data output.",
diff --git a/examples/tcp/dctcp-example.cc b/examples/tcp/dctcp-example.cc
index 27afe9416..85e4077a4 100644
--- a/examples/tcp/dctcp-example.cc
+++ b/examples/tcp/dctcp-example.cc
@@ -275,7 +275,7 @@ int main (int argc, char *argv[])
   bool enableSwitchEcn = true;
   Time progressInterval = MilliSeconds (100);
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("tcpTypeId", "ns-3 TCP TypeId", tcpTypeId);
   cmd.AddValue ("flowStartupWindow", "startup time window (TCP staggered starts)", flowStartupWindow);
   cmd.AddValue ("convergenceTime", "convergence time", convergenceTime);
diff --git a/examples/tcp/star.cc b/examples/tcp/star.cc
index f75e8e7bb..1e7b94ddf 100644
--- a/examples/tcp/star.cc
+++ b/examples/tcp/star.cc
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
   //
   uint32_t nSpokes = 8;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nSpokes", "Number of nodes to place in the star", nSpokes);
   cmd.Parse (argc, argv);
 
diff --git a/examples/tcp/tcp-bulk-send.cc b/examples/tcp/tcp-bulk-send.cc
index 7be5b2f93..df211c9ce 100644
--- a/examples/tcp/tcp-bulk-send.cc
+++ b/examples/tcp/tcp-bulk-send.cc
@@ -48,7 +48,7 @@ main (int argc, char *argv[])
 // Allow the user to override any of the defaults at
 // run-time, via command-line arguments
 //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("tracing", "Flag to enable/disable tracing", tracing);
   cmd.AddValue ("maxBytes",
                 "Total number of bytes for application to send", maxBytes);
diff --git a/examples/tcp/tcp-large-transfer.cc b/examples/tcp/tcp-large-transfer.cc
index ee94f7448..3298af57f 100644
--- a/examples/tcp/tcp-large-transfer.cc
+++ b/examples/tcp/tcp-large-transfer.cc
@@ -75,7 +75,7 @@ int main (int argc, char *argv[])
   //  LogComponentEnable("PacketSink", LOG_LEVEL_ALL);
   //  LogComponentEnable("TcpLargeTransfer", LOG_LEVEL_ALL);
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   // initialize the tx buffer.
diff --git a/examples/tcp/tcp-nsc-comparison.cc b/examples/tcp/tcp-nsc-comparison.cc
index 17ec9d8c7..ada9aaa90 100644
--- a/examples/tcp/tcp-nsc-comparison.cc
+++ b/examples/tcp/tcp-nsc-comparison.cc
@@ -57,7 +57,7 @@ main (int argc, char *argv[])
   Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1448));
   Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("stack", "choose network stack", m_stack);
   cmd.AddValue ("seed", "randomize seed", m_seed);
   cmd.AddValue ("nNodes", "the number of source and sink nodes", m_nNodes);
diff --git a/examples/tcp/tcp-nsc-lfn.cc b/examples/tcp/tcp-nsc-lfn.cc
index 2a3c90bbc..9147d895a 100644
--- a/examples/tcp/tcp-nsc-lfn.cc
+++ b/examples/tcp/tcp-nsc-lfn.cc
@@ -57,7 +57,7 @@ int main (int argc, char *argv[])
   // the name of the NSC stack library that should be used
   std::string nscStack = "liblinux2.6.26.so";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   // Here, we define additional command line options.
   // This allows a user to override the defaults set above from the command line.
   cmd.AddValue ("TCP_CONGESTION", "Linux 2.6.26 Tcp Congestion control algorithm to use", tcpCong);
diff --git a/examples/tcp/tcp-nsc-zoo.cc b/examples/tcp/tcp-nsc-zoo.cc
index d56fbe573..bde60c43f 100644
--- a/examples/tcp/tcp-nsc-zoo.cc
+++ b/examples/tcp/tcp-nsc-zoo.cc
@@ -49,7 +49,7 @@ int main (int argc, char *argv[])
 
   Config::SetDefault ("ns3::OnOffApplication::PacketSize", UintegerValue (2048));
   Config::SetDefault ("ns3::OnOffApplication::DataRate", StringValue ("8kbps"));
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   // this allows the user to raise the number of nodes using --nodes=X command-line argument.
   cmd.AddValue ("nodes", "Number of nodes in the network (must be > 1)", MaxNodes);
   cmd.AddValue ("runtime", "How long the applications should send data (default 3 seconds)", runtime);
diff --git a/examples/tcp/tcp-pacing.cc b/examples/tcp/tcp-pacing.cc
index 13090187d..657f3e3d6 100644
--- a/examples/tcp/tcp-pacing.cc
+++ b/examples/tcp/tcp-pacing.cc
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
   bool isSack = false;
   uint32_t maxPackets = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("tracing", "Flag to enable/disable tracing", tracing);
   cmd.AddValue ("maxBytes",
                 "Total number of bytes for application to send", maxBytes);
diff --git a/examples/tcp/tcp-pcap-nanosec-example.cc b/examples/tcp/tcp-pcap-nanosec-example.cc
index 3b155e686..b57150a68 100644
--- a/examples/tcp/tcp-pcap-nanosec-example.cc
+++ b/examples/tcp/tcp-pcap-nanosec-example.cc
@@ -63,7 +63,7 @@ main (int argc, char *argv[])
 // Allow the user to override any of the defaults at
 // run-time, via command-line arguments
 //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("tracing", "Flag to enable tracing", tracing);
   cmd.AddValue ("nanosec",  "Flag to use nanosecond timestamps for pcap as default", nanosec);
   cmd.AddValue ("maxBytes",
diff --git a/examples/tcp/tcp-star-server.cc b/examples/tcp/tcp-star-server.cc
index 891ee6a33..fc9373e6e 100644
--- a/examples/tcp/tcp-star-server.cc
+++ b/examples/tcp/tcp-star-server.cc
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Config::SetDefault()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nNodes", "Number of nodes to place in the star", N);
   cmd.Parse (argc, argv);
 
diff --git a/examples/tcp/tcp-variants-comparison.cc b/examples/tcp/tcp-variants-comparison.cc
index 565716e59..78c45e9a8 100644
--- a/examples/tcp/tcp-variants-comparison.cc
+++ b/examples/tcp/tcp-variants-comparison.cc
@@ -226,7 +226,7 @@ int main (int argc, char *argv[])
   std::string recovery = "ns3::TcpClassicRecovery";
 
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("transport_prot", "Transport protocol to use: TcpNewReno, "
                 "TcpHybla, TcpHighSpeed, TcpHtcp, TcpVegas, TcpScalable, TcpVeno, "
                 "TcpBic, TcpYeah, TcpIllinois, TcpWestwood, TcpWestwoodPlus, TcpLedbat, "
diff --git a/examples/traffic-control/queue-discs-benchmark.cc b/examples/traffic-control/queue-discs-benchmark.cc
index 24caff85d..ce5849635 100644
--- a/examples/traffic-control/queue-discs-benchmark.cc
+++ b/examples/traffic-control/queue-discs-benchmark.cc
@@ -109,7 +109,7 @@ int main (int argc, char *argv[])
   float simDuration = 60;
   float samplingPeriod = 1;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("bandwidth", "Bottleneck bandwidth", bandwidth);
   cmd.AddValue ("delay", "Bottleneck delay", delay);
   cmd.AddValue ("queueDiscType", "Bottleneck queue disc type in {PfifoFast, ARED, CoDel, FqCoDel, PIE, prio}", queueDiscType);
diff --git a/examples/traffic-control/red-vs-fengadaptive.cc b/examples/traffic-control/red-vs-fengadaptive.cc
index f09616988..417893acb 100644
--- a/examples/traffic-control/red-vs-fengadaptive.cc
+++ b/examples/traffic-control/red-vs-fengadaptive.cc
@@ -48,7 +48,7 @@ int main (int argc, char *argv[])
   std::string bottleNeckLinkBw = "1Mbps";
   std::string bottleNeckLinkDelay = "50ms";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nLeaf", "Number of left and right side leaf nodes", nLeaf);
   cmd.AddValue ("maxPackets","Max Packets allowed in the device queue", maxPackets);
   cmd.AddValue ("queueDiscLimitPackets","Max Packets allowed in the queue disc", queueDiscLimitPackets);
diff --git a/examples/traffic-control/red-vs-nlred.cc b/examples/traffic-control/red-vs-nlred.cc
index c2fcaf653..404cb11e6 100644
--- a/examples/traffic-control/red-vs-nlred.cc
+++ b/examples/traffic-control/red-vs-nlred.cc
@@ -50,7 +50,7 @@ int main (int argc, char *argv[])
   std::string bottleNeckLinkBw = "1Mbps";
   std::string bottleNeckLinkDelay = "50ms";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nLeaf",     "Number of left and right side leaf nodes", nLeaf);
   cmd.AddValue ("maxPackets","Max Packets allowed in the device queue", maxPackets);
   cmd.AddValue ("queueDiscLimitPackets","Max Packets allowed in the queue disc", queueDiscLimitPackets);
diff --git a/examples/traffic-control/tbf-example.cc b/examples/traffic-control/tbf-example.cc
index a95f40cb5..dac72f38d 100644
--- a/examples/traffic-control/tbf-example.cc
+++ b/examples/traffic-control/tbf-example.cc
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
   DataRate rate = DataRate ("1Mbps");
   DataRate peakRate = DataRate ("0bps");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("burst", "Size of first bucket in bytes", burst);
   cmd.AddValue ("mtu", "Size of second bucket in bytes", mtu);
   cmd.AddValue ("rate", "Rate of tokens arriving in first bucket", rate);
diff --git a/examples/traffic-control/traffic-control.cc b/examples/traffic-control/traffic-control.cc
index ea7a3eea0..e6ca87bc7 100644
--- a/examples/traffic-control/traffic-control.cc
+++ b/examples/traffic-control/traffic-control.cc
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
   std::string transportProt = "Tcp";
   std::string socketType;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("transportProt", "Transport protocol to use: Tcp, Udp", transportProt);
   cmd.Parse (argc, argv);
 
diff --git a/examples/tutorial/fifth.cc b/examples/tutorial/fifth.cc
index 934d34dd8..d8e27ecce 100644
--- a/examples/tutorial/fifth.cc
+++ b/examples/tutorial/fifth.cc
@@ -175,7 +175,7 @@ RxDrop (Ptr<const Packet> p)
 int 
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   NodeContainer nodes;
diff --git a/examples/tutorial/first.cc b/examples/tutorial/first.cc
index ca91a83c7..3fbfd334d 100644
--- a/examples/tutorial/first.cc
+++ b/examples/tutorial/first.cc
@@ -34,7 +34,7 @@ NS_LOG_COMPONENT_DEFINE ("FirstScriptExample");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   Time::SetResolution (Time::NS);
diff --git a/examples/tutorial/second.cc b/examples/tutorial/second.cc
index 33298367b..790ba8df5 100644
--- a/examples/tutorial/second.cc
+++ b/examples/tutorial/second.cc
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   bool verbose = true;
   uint32_t nCsma = 3;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma);
   cmd.AddValue ("verbose", "Tell echo applications to log if true", verbose);
 
diff --git a/examples/tutorial/seventh.cc b/examples/tutorial/seventh.cc
index 9f8c5a5b3..116abfbd9 100644
--- a/examples/tutorial/seventh.cc
+++ b/examples/tutorial/seventh.cc
@@ -202,7 +202,7 @@ main (int argc, char *argv[])
 {
   bool useV6 = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
   cmd.Parse (argc, argv);
 
diff --git a/examples/tutorial/sixth.cc b/examples/tutorial/sixth.cc
index 0f15ae62c..faa03969e 100644
--- a/examples/tutorial/sixth.cc
+++ b/examples/tutorial/sixth.cc
@@ -192,7 +192,7 @@ RxDrop (Ptr<PcapFileWrapper> file, Ptr<const Packet> p)
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   NodeContainer nodes;
diff --git a/examples/tutorial/third.cc b/examples/tutorial/third.cc
index ee17a5c86..b0f8846ee 100644
--- a/examples/tutorial/third.cc
+++ b/examples/tutorial/third.cc
@@ -47,7 +47,7 @@ main (int argc, char *argv[])
   uint32_t nWifi = 3;
   bool tracing = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma);
   cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi);
   cmd.AddValue ("verbose", "Tell echo applications to log if true", verbose);
diff --git a/examples/udp-client-server/udp-client-server.cc b/examples/udp-client-server/udp-client-server.cc
index 866495971..52628c3a6 100644
--- a/examples/udp-client-server/udp-client-server.cc
+++ b/examples/udp-client-server/udp-client-server.cc
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   bool useV6 = false;
   Address serverAddress;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
   cmd.Parse (argc, argv);
 
diff --git a/examples/udp-client-server/udp-trace-client-server.cc b/examples/udp-client-server/udp-trace-client-server.cc
index cfbbd6262..3391065ee 100644
--- a/examples/udp-client-server/udp-trace-client-server.cc
+++ b/examples/udp-client-server/udp-trace-client-server.cc
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   bool useV6 = false;
   Address serverAddress;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
   cmd.Parse (argc, argv);
 
diff --git a/examples/udp/udp-echo.cc b/examples/udp/udp-echo.cc
index a8824cf73..10276d0dc 100644
--- a/examples/udp/udp-echo.cc
+++ b/examples/udp/udp-echo.cc
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
   bool useV6 = false;
   Address serverAddress;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("useIpv6", "Use Ipv6", useV6);
   cmd.Parse (argc, argv);
 //
diff --git a/examples/wireless/mixed-wired-wireless.cc b/examples/wireless/mixed-wired-wireless.cc
index eb4cdab9a..3b46aafb4 100644
--- a/examples/wireless/mixed-wired-wireless.cc
+++ b/examples/wireless/mixed-wired-wireless.cc
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
   // system so that they can be overridden with flags such as
   // "--backboneNodes=20"
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("backboneNodes", "number of backbone nodes", backboneNodes);
   cmd.AddValue ("infraNodes", "number of leaf nodes", infraNodes);
   cmd.AddValue ("lanNodes", "number of LAN nodes", lanNodes);
diff --git a/examples/wireless/wifi-80211e-txop.cc b/examples/wireless/wifi-80211e-txop.cc
index d4892f4b1..449cd797f 100644
--- a/examples/wireless/wifi-80211e-txop.cc
+++ b/examples/wireless/wifi-80211e-txop.cc
@@ -91,7 +91,7 @@ int main (int argc, char *argv[])
   bool enablePcap = 0;
   bool verifyResults = 0; //used for regression
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("distance", "Distance in meters between the station and the access point", distance);
diff --git a/examples/wireless/wifi-80211n-mimo.cc b/examples/wireless/wifi-80211n-mimo.cc
index 4807c786e..213149567 100644
--- a/examples/wireless/wifi-80211n-mimo.cc
+++ b/examples/wireless/wifi-80211n-mimo.cc
@@ -97,7 +97,7 @@ int main (int argc, char *argv[])
   bool shortGuardInterval = false;
   bool channelBonding = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("step", "Granularity of the results to be plotted in meters", step);
   cmd.AddValue ("simulationTime", "Simulation time per step (in seconds)", simulationTime);
   cmd.AddValue ("channelBonding", "Enable/disable channel bonding (channel width = 20 MHz if false, channel width = 40 MHz if true)", channelBonding);
diff --git a/examples/wireless/wifi-adhoc.cc b/examples/wireless/wifi-adhoc.cc
index 20b12032c..c75530827 100644
--- a/examples/wireless/wifi-adhoc.cc
+++ b/examples/wireless/wifi-adhoc.cc
@@ -167,7 +167,7 @@ Experiment::Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy,
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Gnuplot gnuplot = Gnuplot ("reference-rates.png");
diff --git a/examples/wireless/wifi-aggregation.cc b/examples/wireless/wifi-aggregation.cc
index 8e550cffc..3d75ba091 100644
--- a/examples/wireless/wifi-aggregation.cc
+++ b/examples/wireless/wifi-aggregation.cc
@@ -81,7 +81,7 @@ int main (int argc, char *argv[])
   bool enablePcap = 0;
   bool verifyResults = 0; //used for regression
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("enableRts", "Enable or disable RTS/CTS", enableRts);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
diff --git a/examples/wireless/wifi-ap.cc b/examples/wireless/wifi-ap.cc
index f044bfcc1..4f3666fa4 100644
--- a/examples/wireless/wifi-ap.cc
+++ b/examples/wireless/wifi-ap.cc
@@ -115,7 +115,7 @@ AdvancePosition (Ptr<Node> node)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "Print trace information if true", g_verbose);
   cmd.Parse (argc, argv);
 
diff --git a/examples/wireless/wifi-backward-compatibility.cc b/examples/wireless/wifi-backward-compatibility.cc
index d14ef3ec0..77d8f1253 100644
--- a/examples/wireless/wifi-backward-compatibility.cc
+++ b/examples/wireless/wifi-backward-compatibility.cc
@@ -104,7 +104,7 @@ int main (int argc, char *argv[])
   bool apHasTraffic = false;
   bool staHasTraffic = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("apVersion", "The standard version used by the AP: 80211a, 80211b, 80211g, 80211_10MHZ, 80211_5MHZ, holland, 80211n_2_4GHZ, 80211n_5GHZ or 80211ac", apVersion);
   cmd.AddValue ("staVersion", "The standard version used by the station: 80211a, 80211b, 80211g, 80211_10MHZ, 80211_5MHZ, holland, 80211n_2_4GHZ, 80211n_5GHZ or 80211ac", staVersion);
diff --git a/examples/wireless/wifi-blockack.cc b/examples/wireless/wifi-blockack.cc
index cf9fa5202..444d69204 100644
--- a/examples/wireless/wifi-blockack.cc
+++ b/examples/wireless/wifi-blockack.cc
@@ -63,7 +63,7 @@ NS_LOG_COMPONENT_DEFINE ("Test-block-ack");
 
 int main (int argc, char * argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   LogComponentEnable ("QosTxop", LOG_LEVEL_DEBUG);
diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc
index 94c984700..f8f24de31 100644
--- a/examples/wireless/wifi-clear-channel-cmu.cc
+++ b/examples/wireless/wifi-clear-channel-cmu.cc
@@ -175,7 +175,7 @@ int main (int argc, char *argv[])
   modes.push_back ("DsssRate5_5Mbps");
   modes.push_back ("DsssRate11Mbps");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Gnuplot gnuplot = Gnuplot ("clear-channel.eps");
diff --git a/examples/wireless/wifi-dsss-validation.cc b/examples/wireless/wifi-dsss-validation.cc
index d9a6a91d7..70afde6cf 100644
--- a/examples/wireless/wifi-dsss-validation.cc
+++ b/examples/wireless/wifi-dsss-validation.cc
@@ -42,7 +42,7 @@ int main (int argc, char *argv[])
   modes.push_back ("DsssRate5_5Mbps");
   modes.push_back ("DsssRate11Mbps");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize);
   cmd.Parse (argc, argv);
 
diff --git a/examples/wireless/wifi-he-network.cc b/examples/wireless/wifi-he-network.cc
index 9866e6d63..6e2fb9ec6 100644
--- a/examples/wireless/wifi-he-network.cc
+++ b/examples/wireless/wifi-he-network.cc
@@ -69,7 +69,7 @@ int main (int argc, char *argv[])
   double minExpectedThroughput = 0;
   double maxExpectedThroughput = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("frequency", "Whether working in the 2.4 or 5.0 GHz band (other values gets rejected)", frequency);
   cmd.AddValue ("distance", "Distance in meters between the station and the access point", distance);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
diff --git a/examples/wireless/wifi-hidden-terminal.cc b/examples/wireless/wifi-hidden-terminal.cc
index facea5d9c..31ff2cb2c 100644
--- a/examples/wireless/wifi-hidden-terminal.cc
+++ b/examples/wireless/wifi-hidden-terminal.cc
@@ -180,7 +180,7 @@ void experiment (bool enableCtsRts, std::string wifiManager)
 int main (int argc, char **argv)
 {
   std::string wifiManager ("Arf");
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("wifiManager", "Set wifi rate manager (Aarf, Aarfcd, Amrr, Arf, Cara, Ideal, Minstrel, Onoe, Rraa)", wifiManager);
   cmd.Parse (argc, argv);
 
diff --git a/examples/wireless/wifi-ht-network.cc b/examples/wireless/wifi-ht-network.cc
index 942a26c8d..61548ecbc 100644
--- a/examples/wireless/wifi-ht-network.cc
+++ b/examples/wireless/wifi-ht-network.cc
@@ -69,7 +69,7 @@ int main (int argc, char *argv[])
   double minExpectedThroughput = 0;
   double maxExpectedThroughput = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("frequency", "Whether working in the 2.4 or 5.0 GHz band (other values gets rejected)", frequency);
   cmd.AddValue ("distance", "Distance in meters between the station and the access point", distance);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
diff --git a/examples/wireless/wifi-mixed-network.cc b/examples/wireless/wifi-mixed-network.cc
index 79153811e..a0877842a 100644
--- a/examples/wireless/wifi-mixed-network.cc
+++ b/examples/wireless/wifi-mixed-network.cc
@@ -418,7 +418,7 @@ int main (int argc, char *argv[])
 
   bool verifyResults = 0; //used for regression
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", params.payloadSize);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", params.simulationTime);
   cmd.AddValue ("isUdp", "UDP if set to 1, TCP otherwise", params.isUdp);
diff --git a/examples/wireless/wifi-multi-tos.cc b/examples/wireless/wifi-multi-tos.cc
index d7181442d..3f213c896 100644
--- a/examples/wireless/wifi-multi-tos.cc
+++ b/examples/wireless/wifi-multi-tos.cc
@@ -55,7 +55,7 @@ int main (int argc, char *argv[])
   bool useShortGuardInterval = false;
   bool useRts = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nWifi", "Number of stations", nWifi);
   cmd.AddValue ("distance", "Distance in meters between the stations and the access point", distance);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
diff --git a/examples/wireless/wifi-multirate.cc b/examples/wireless/wifi-multirate.cc
index b35c01577..b914b9e8d 100644
--- a/examples/wireless/wifi-multirate.cc
+++ b/examples/wireless/wifi-multirate.cc
@@ -554,7 +554,7 @@ bool
 Experiment::CommandSetup (int argc, char **argv)
 {
   // for commandline input
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("packetSize", "packet size", packetSize);
   cmd.AddValue ("totalTime", "simulation time", totalTime);
   // according to totalTime, select an appropriate samplingPeriod automatically.
diff --git a/examples/wireless/wifi-ofdm-he-validation.cc b/examples/wireless/wifi-ofdm-he-validation.cc
index 8a8d55e71..739849a45 100644
--- a/examples/wireless/wifi-ofdm-he-validation.cc
+++ b/examples/wireless/wifi-ofdm-he-validation.cc
@@ -51,7 +51,7 @@ int main (int argc, char *argv[])
   modes.push_back ("HeMcs10");
   modes.push_back ("HeMcs11");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size", FrameSize);
   cmd.Parse (argc, argv);
 
diff --git a/examples/wireless/wifi-ofdm-ht-validation.cc b/examples/wireless/wifi-ofdm-ht-validation.cc
index df8deb24f..4968517d3 100644
--- a/examples/wireless/wifi-ofdm-ht-validation.cc
+++ b/examples/wireless/wifi-ofdm-ht-validation.cc
@@ -48,7 +48,7 @@ int main (int argc, char *argv[])
   modes.push_back ("HtMcs7");
 
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize);
   cmd.Parse (argc, argv);
 
diff --git a/examples/wireless/wifi-ofdm-validation.cc b/examples/wireless/wifi-ofdm-validation.cc
index 5fb9e3748..23ef3be8c 100644
--- a/examples/wireless/wifi-ofdm-validation.cc
+++ b/examples/wireless/wifi-ofdm-validation.cc
@@ -49,7 +49,7 @@ int main (int argc, char *argv[])
   modes.push_back ("OfdmRate48Mbps");
   modes.push_back ("OfdmRate54Mbps");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize);
   cmd.Parse (argc, argv);
 
diff --git a/examples/wireless/wifi-ofdm-vht-validation.cc b/examples/wireless/wifi-ofdm-vht-validation.cc
index c8caab314..ec62733ef 100644
--- a/examples/wireless/wifi-ofdm-vht-validation.cc
+++ b/examples/wireless/wifi-ofdm-vht-validation.cc
@@ -49,7 +49,7 @@ int main (int argc, char *argv[])
   modes.push_back ("VhtMcs7");
   modes.push_back ("VhtMcs8");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("FrameSize", "The frame size in bytes", FrameSize);
   cmd.Parse (argc, argv);
 
diff --git a/examples/wireless/wifi-pcf.cc b/examples/wireless/wifi-pcf.cc
index 433426c7a..5e1f08d77 100644
--- a/examples/wireless/wifi-pcf.cc
+++ b/examples/wireless/wifi-pcf.cc
@@ -133,7 +133,7 @@ int main (int argc, char *argv[])
   uint64_t cfpMaxDurationUs = 65536; //microseconds
   double simulationTime = 10; //seconds
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi);
   cmd.AddValue ("enablePcf", "Enable/disable PCF mode", enablePcf);
   cmd.AddValue ("withData", "Enable/disable UDP data packets generation", withData);
diff --git a/examples/wireless/wifi-power-adaptation-distance.cc b/examples/wireless/wifi-power-adaptation-distance.cc
index b31255dc5..3012ecb0e 100644
--- a/examples/wireless/wifi-power-adaptation-distance.cc
+++ b/examples/wireless/wifi-power-adaptation-distance.cc
@@ -304,7 +304,7 @@ int main (int argc, char *argv[])
   uint32_t stepsSize = 1;
   uint32_t stepsTime = 1;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("manager", "PRC Manager", manager);
   cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold);
   cmd.AddValue ("outputFileName", "Output filename", outputFileName);
diff --git a/examples/wireless/wifi-power-adaptation-interference.cc b/examples/wireless/wifi-power-adaptation-interference.cc
index 522002c05..4c002fab3 100644
--- a/examples/wireless/wifi-power-adaptation-interference.cc
+++ b/examples/wireless/wifi-power-adaptation-interference.cc
@@ -354,7 +354,7 @@ int main (int argc, char *argv[])
   int sta2_y = 0;
   uint32_t simuTime = 100;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("manager", "PRC Manager", manager);
   cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold);
   cmd.AddValue ("outputFileName", "Output filename", outputFileName);
diff --git a/examples/wireless/wifi-rate-adaptation-distance.cc b/examples/wireless/wifi-rate-adaptation-distance.cc
index c3731e748..cdf617c34 100644
--- a/examples/wireless/wifi-rate-adaptation-distance.cc
+++ b/examples/wireless/wifi-rate-adaptation-distance.cc
@@ -163,7 +163,7 @@ int main (int argc, char *argv[])
   int stepsSize = 1;
   int stepsTime = 1;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("staManager", "PRC Manager of the STA", staManager);
   cmd.AddValue ("apManager", "PRC Manager of the AP", apManager);
   cmd.AddValue ("standard", "Wifi Phy Standard", standard);
diff --git a/examples/wireless/wifi-simple-adhoc-grid.cc b/examples/wireless/wifi-simple-adhoc-grid.cc
index 6a9542a65..13e76b15d 100644
--- a/examples/wireless/wifi-simple-adhoc-grid.cc
+++ b/examples/wireless/wifi-simple-adhoc-grid.cc
@@ -126,7 +126,7 @@ int main (int argc, char *argv[])
   bool verbose = false;
   bool tracing = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("distance", "distance (m)", distance);
   cmd.AddValue ("packetSize", "size of application packet sent", packetSize);
diff --git a/examples/wireless/wifi-simple-adhoc.cc b/examples/wireless/wifi-simple-adhoc.cc
index 9d8121ba2..af1803ea2 100644
--- a/examples/wireless/wifi-simple-adhoc.cc
+++ b/examples/wireless/wifi-simple-adhoc.cc
@@ -98,7 +98,7 @@ int main (int argc, char *argv[])
   double interval = 1.0; // seconds
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("rss", "received signal strength", rss);
   cmd.AddValue ("packetSize", "size of application packet sent", packetSize);
diff --git a/examples/wireless/wifi-simple-ht-hidden-stations.cc b/examples/wireless/wifi-simple-ht-hidden-stations.cc
index bbc324fa7..1e76963d3 100644
--- a/examples/wireless/wifi-simple-ht-hidden-stations.cc
+++ b/examples/wireless/wifi-simple-ht-hidden-stations.cc
@@ -63,7 +63,7 @@ int main (int argc, char *argv[])
   double minExpectedThroughput = 0;
   double maxExpectedThroughput = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nMpdus", "Number of aggregated MPDUs", nMpdus);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("enableRts", "Enable RTS/CTS", enableRts);
diff --git a/examples/wireless/wifi-simple-infra.cc b/examples/wireless/wifi-simple-infra.cc
index a4b68e821..2f08e66dd 100644
--- a/examples/wireless/wifi-simple-infra.cc
+++ b/examples/wireless/wifi-simple-infra.cc
@@ -100,7 +100,7 @@ int main (int argc, char *argv[])
   double interval = 1.0; // seconds
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("rss", "received signal strength", rss);
   cmd.AddValue ("packetSize", "size of application packet sent", packetSize);
diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc
index 6501d8550..8a7d83bf2 100644
--- a/examples/wireless/wifi-simple-interference.cc
+++ b/examples/wireless/wifi-simple-interference.cc
@@ -150,7 +150,7 @@ int main (int argc, char *argv[])
 
   double offset = 91;  // This is a magic number used to set the
                        // transmit power, based on other configuration
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("Prss", "Intended primary received signal strength (dBm)", Prss);
   cmd.AddValue ("Irss", "Intended interfering received signal strength (dBm)", Irss);
diff --git a/examples/wireless/wifi-sleep.cc b/examples/wireless/wifi-sleep.cc
index 679bca358..d2f331743 100644
--- a/examples/wireless/wifi-sleep.cc
+++ b/examples/wireless/wifi-sleep.cc
@@ -103,7 +103,7 @@ int main (int argc, char *argv[])
   double txCurrent = 0.380; // Ampere
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("dataRate", "Data rate", dataRate);
   cmd.AddValue ("packetSize", "size of application packet sent", packetSize);
   cmd.AddValue ("duration", "duration (seconds) of the experiment", duration);
diff --git a/examples/wireless/wifi-spatial-reuse.cc b/examples/wireless/wifi-spatial-reuse.cc
index cc1a8050b..f07cbd620 100644
--- a/examples/wireless/wifi-spatial-reuse.cc
+++ b/examples/wireless/wifi-spatial-reuse.cc
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
   bool enableObssPd = true;
   double obssPdThreshold = -72.0; // dBm
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("duration", "Duration of simulation (s)", duration);
   cmd.AddValue ("interval", "Inter packet interval (s)", interval);
   cmd.AddValue ("enableObssPd", "Enable/disable OBSS_PD", enableObssPd);
diff --git a/examples/wireless/wifi-spectrum-per-example.cc b/examples/wireless/wifi-spectrum-per-example.cc
index 6ff4ed6f4..6f4d7ff84 100644
--- a/examples/wireless/wifi-spectrum-per-example.cc
+++ b/examples/wireless/wifi-spectrum-per-example.cc
@@ -122,7 +122,7 @@ int main (int argc, char *argv[])
   bool enablePcap = false;
   const uint32_t tcpPacketSize = 1448;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("udp", "UDP if set to 1, TCP otherwise", udp);
   cmd.AddValue ("distance", "meters separation between nodes", distance);
diff --git a/examples/wireless/wifi-spectrum-per-interference.cc b/examples/wireless/wifi-spectrum-per-interference.cc
index e9cd7e949..195cf4541 100644
--- a/examples/wireless/wifi-spectrum-per-interference.cc
+++ b/examples/wireless/wifi-spectrum-per-interference.cc
@@ -149,7 +149,7 @@ int main (int argc, char *argv[])
   const uint32_t tcpPacketSize = 1448;
   double waveformPower = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("udp", "UDP if set to 1, TCP otherwise", udp);
   cmd.AddValue ("distance", "meters separation between nodes", distance);
diff --git a/examples/wireless/wifi-spectrum-saturation-example.cc b/examples/wireless/wifi-spectrum-saturation-example.cc
index dd4bedb3e..7b70e65c3 100644
--- a/examples/wireless/wifi-spectrum-saturation-example.cc
+++ b/examples/wireless/wifi-spectrum-saturation-example.cc
@@ -105,7 +105,7 @@ int main (int argc, char *argv[])
   std::string errorModelType = "ns3::NistErrorRateModel";
   bool enablePcap = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("distance", "meters separation between nodes", distance);
   cmd.AddValue ("index", "restrict index to single value between 0 and 63", index);
diff --git a/examples/wireless/wifi-tcp.cc b/examples/wireless/wifi-tcp.cc
index 5a736a39c..6e0f9e5ed 100644
--- a/examples/wireless/wifi-tcp.cc
+++ b/examples/wireless/wifi-tcp.cc
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
   bool pcapTracing = false;                          /* PCAP Tracing is enabled or not. */
 
   /* Command line argument parser setup. */
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("dataRate", "Application data ate", dataRate);
   cmd.AddValue ("tcpVariant", "Transport protocol to use: TcpNewReno, "
diff --git a/examples/wireless/wifi-timing-attributes.cc b/examples/wireless/wifi-timing-attributes.cc
index 400cea65f..ee357755d 100644
--- a/examples/wireless/wifi-timing-attributes.cc
+++ b/examples/wireless/wifi-timing-attributes.cc
@@ -64,7 +64,7 @@ int main (int argc, char *argv[])
   uint32_t compressedBlockAckTimeout = 112; //Compressed BlockAck timeout duration in microseconds
   double simulationTime = 10; //simulation time in seconds
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("slot", "Slot time in microseconds", slot);
   cmd.AddValue ("sifs", "SIFS duration in microseconds", sifs);
   cmd.AddValue ("ackTimeout", "Ack timeout duration in microseconds", ackTimeout);
diff --git a/examples/wireless/wifi-txop-aggregation.cc b/examples/wireless/wifi-txop-aggregation.cc
index d9d68a4be..8f84698d4 100644
--- a/examples/wireless/wifi-txop-aggregation.cc
+++ b/examples/wireless/wifi-txop-aggregation.cc
@@ -102,7 +102,7 @@ int main (int argc, char *argv[])
   bool enablePcap = 0;
   bool verifyResults = 0; //used for regression
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("payloadSize", "Payload size in bytes", payloadSize);
   cmd.AddValue ("enableRts", "Enable or disable RTS/CTS", enableRts);
   cmd.AddValue ("txopLimit", "TXOP duration in microseconds", txopLimit);
diff --git a/examples/wireless/wifi-vht-network.cc b/examples/wireless/wifi-vht-network.cc
index 6d035b646..48a8d694a 100644
--- a/examples/wireless/wifi-vht-network.cc
+++ b/examples/wireless/wifi-vht-network.cc
@@ -67,7 +67,7 @@ int main (int argc, char *argv[])
   double minExpectedThroughput = 0;
   double maxExpectedThroughput = 0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("distance", "Distance in meters between the station and the access point", distance);
   cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
   cmd.AddValue ("udp", "UDP if set to 1, TCP otherwise", udp);
diff --git a/examples/wireless/wifi-wired-bridging.cc b/examples/wireless/wifi-wired-bridging.cc
index ee9bba758..b26834c2e 100644
--- a/examples/wireless/wifi-wired-bridging.cc
+++ b/examples/wireless/wifi-wired-bridging.cc
@@ -65,7 +65,7 @@ int main (int argc, char *argv[])
   bool sendIp = true;
   bool writeMobility = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nWifis", "Number of wifi networks", nWifis);
   cmd.AddValue ("nStas", "Number of stations per wifi network", nStas);
   cmd.AddValue ("SendIp", "Send Ipv4 or raw packets", sendIp);
diff --git a/src/aodv/examples/aodv.cc b/src/aodv/examples/aodv.cc
index a2ba146c4..325e30662 100644
--- a/src/aodv/examples/aodv.cc
+++ b/src/aodv/examples/aodv.cc
@@ -129,7 +129,7 @@ AodvExample::Configure (int argc, char **argv)
   // LogComponentEnable("AodvRoutingProtocol", LOG_LEVEL_ALL);
 
   SeedManager::SetSeed (12345);
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.AddValue ("pcap", "Write PCAP traces.", pcap);
   cmd.AddValue ("printRoutes", "Print routing table dumps.", printRoutes);
diff --git a/src/applications/examples/three-gpp-http-example.cc b/src/applications/examples/three-gpp-http-example.cc
index 5c234491d..ce4df9bf9 100644
--- a/src/applications/examples/three-gpp-http-example.cc
+++ b/src/applications/examples/three-gpp-http-example.cc
@@ -98,7 +98,7 @@ int
 main (int argc, char *argv[])
 {
   double simTimeSec = 300;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("SimulationTime", "Length of simulation in seconds.", simTimeSec);
   cmd.Parse (argc, argv);
 
diff --git a/src/bridge/examples/csma-bridge-one-hop.cc b/src/bridge/examples/csma-bridge-one-hop.cc
index 8e2c67091..814aa2078 100644
--- a/src/bridge/examples/csma-bridge-one-hop.cc
+++ b/src/bridge/examples/csma-bridge-one-hop.cc
@@ -101,7 +101,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults and the above Bind() at
   // run-time, via command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //
diff --git a/src/bridge/examples/csma-bridge.cc b/src/bridge/examples/csma-bridge.cc
index ef5ab7488..86ee8ca70 100644
--- a/src/bridge/examples/csma-bridge.cc
+++ b/src/bridge/examples/csma-bridge.cc
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults and the above Bind() at
   // run-time, via command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //
diff --git a/src/brite/examples/brite-MPI-example.cc b/src/brite/examples/brite-MPI-example.cc
index f5c3c46ca..6183905f7 100644
--- a/src/brite/examples/brite-MPI-example.cc
+++ b/src/brite/examples/brite-MPI-example.cc
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   bool tracing = false;
   bool nix = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("confFile", "BRITE conf file", confFile);
   cmd.AddValue ("tracing", "Enable or disable ascii tracing", tracing);
   cmd.AddValue ("nix", "Enable or disable nix-vector routing", nix);
diff --git a/src/brite/examples/brite-generic-example.cc b/src/brite/examples/brite-generic-example.cc
index f3bb37861..e55014825 100644
--- a/src/brite/examples/brite-generic-example.cc
+++ b/src/brite/examples/brite-generic-example.cc
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
   bool tracing = false;
   bool nix = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("confFile", "BRITE conf file", confFile);
   cmd.AddValue ("tracing", "Enable or disable ascii tracing", tracing);
   cmd.AddValue ("nix", "Enable or disable nix-vector routing", nix);
diff --git a/src/buildings/examples/buildings-pathloss-profiler.cc b/src/buildings/examples/buildings-pathloss-profiler.cc
index 21b55ea7d..2b0560f0b 100644
--- a/src/buildings/examples/buildings-pathloss-profiler.cc
+++ b/src/buildings/examples/buildings-pathloss-profiler.cc
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   double hUe = 1.0;
   bool enbIndoor = false;
   bool ueIndoor = false;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   
   cmd.AddValue("hEnb", "Height of the eNB", hEnb);
   cmd.AddValue("hUe", "Height of UE", hUe);
diff --git a/src/click/examples/nsclick-defines.cc b/src/click/examples/nsclick-defines.cc
index f13418a8f..e0c2cc3d3 100644
--- a/src/click/examples/nsclick-defines.cc
+++ b/src/click/examples/nsclick-defines.cc
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
 #ifdef NS3_CLICK
   std::string clickConfigFolder = "src/click/examples";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder);
   cmd.Parse (argc, argv);
 
diff --git a/src/click/examples/nsclick-raw-wlan.cc b/src/click/examples/nsclick-raw-wlan.cc
index db2ec72c1..97b02f369 100644
--- a/src/click/examples/nsclick-raw-wlan.cc
+++ b/src/click/examples/nsclick-raw-wlan.cc
@@ -47,7 +47,7 @@ int main (int argc, char *argv[])
   double rss = -80;
   std::string clickConfigFolder = "src/click/examples";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder);
   cmd.Parse (argc, argv);
 
diff --git a/src/click/examples/nsclick-routing.cc b/src/click/examples/nsclick-routing.cc
index 6d8b87eaa..febf667de 100644
--- a/src/click/examples/nsclick-routing.cc
+++ b/src/click/examples/nsclick-routing.cc
@@ -49,7 +49,7 @@ main (int argc, char *argv[])
 #ifdef NS3_CLICK
   std::string clickConfigFolder = "src/click/examples";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder);
   cmd.Parse (argc, argv);
 
diff --git a/src/click/examples/nsclick-simple-lan.cc b/src/click/examples/nsclick-simple-lan.cc
index 8a73f84b2..e6332f0fa 100644
--- a/src/click/examples/nsclick-simple-lan.cc
+++ b/src/click/examples/nsclick-simple-lan.cc
@@ -45,7 +45,7 @@ int main (int argc, char *argv[])
 #ifdef NS3_CLICK
   std::string clickConfigFolder = "src/click/examples";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder);
   cmd.Parse (argc, argv);
 
diff --git a/src/click/examples/nsclick-udp-client-server-csma.cc b/src/click/examples/nsclick-udp-client-server-csma.cc
index d81ccd5c3..41193a1d4 100644
--- a/src/click/examples/nsclick-udp-client-server-csma.cc
+++ b/src/click/examples/nsclick-udp-client-server-csma.cc
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
 #ifdef NS3_CLICK
   std::string clickConfigFolder = "src/click/examples";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder);
   cmd.Parse (argc, argv);
 
diff --git a/src/click/examples/nsclick-udp-client-server-wifi.cc b/src/click/examples/nsclick-udp-client-server-wifi.cc
index 26619fdea..f8c7005f6 100644
--- a/src/click/examples/nsclick-udp-client-server-wifi.cc
+++ b/src/click/examples/nsclick-udp-client-server-wifi.cc
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
 #ifdef NS3_CLICK
   std::string clickConfigFolder = "src/click/examples";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("clickConfigFolder", "Base folder for click configuration files", clickConfigFolder);
   cmd.Parse (argc, argv);
 
diff --git a/src/config-store/examples/config-store-save.cc b/src/config-store/examples/config-store-save.cc
index 047bafae8..635872ed1 100644
--- a/src/config-store/examples/config-store-save.cc
+++ b/src/config-store/examples/config-store-save.cc
@@ -40,7 +40,7 @@ NS_OBJECT_ENSURE_REGISTERED (ConfigExample);
 // 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   Config::SetDefault ("ns3::ConfigExample::TestInt16", IntegerValue (-5));
diff --git a/src/core/examples/command-line-example.cc b/src/core/examples/command-line-example.cc
index 5db60b128..393a6637e 100644
--- a/src/core/examples/command-line-example.cc
+++ b/src/core/examples/command-line-example.cc
@@ -28,7 +28,7 @@
  * \file
  * \ingroup core-examples
  * \ingroup commandline
- * Example program illustrating use of ns3::CommandLine.
+ * \brief Example program illustrating use of ns3::CommandLine.
  */
 
 using namespace ns3;
@@ -89,7 +89,7 @@ int main (int argc, char *argv[])
   const int nonOpt2Def = nonOpt2;
 
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Usage ("CommandLine example program.\n"
              "\n"
              "This little program demonstrates how to use CommandLine.");
@@ -98,13 +98,13 @@ int main (int argc, char *argv[])
   cmd.AddValue ("strArg",  "a string argument",     strArg);
   cmd.AddValue ("anti",    attrPath);
   cmd.AddValue ("cbArg",   "a string via callback", MakeCallback (SetCbArg));
-  cmd.AddNonOption ("nonOpt1", "first non-option", nonOpt1);
-  cmd.AddNonOption ("nonOpt2", "first non-option", nonOpt2);
+  cmd.AddNonOption ("nonOpt1", "first non-option",  nonOpt1);
+  cmd.AddNonOption ("nonOpt2", "second non-option", nonOpt2);
   cmd.Parse (argc, argv);
 
   // Show initial values:
   std::cout << std::endl;
-  std::cout << cmd.GetName () << ":" << std::endl;
+  std::cout << cmd.GetName () << std::endl;
   std::cout << "Initial values:" << std::endl;
 
   std::cout << std::left << std::setw (10) << "intArg:"
diff --git a/src/core/examples/hash-example.cc b/src/core/examples/hash-example.cc
index c351ceca1..125989a5a 100644
--- a/src/core/examples/hash-example.cc
+++ b/src/core/examples/hash-example.cc
@@ -548,7 +548,7 @@ main (int argc, char *argv[])
   bool timing = false;
   DictFiles files;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Usage ("Find hash collisions in the dictionary.");
   cmd.AddValue ("dict", "Dictionary file to hash",
                 MakeCallback (&DictFiles::Add,
diff --git a/src/core/examples/main-callback.cc b/src/core/examples/main-callback.cc
index 77d7b12d7..7a9476906 100644
--- a/src/core/examples/main-callback.cc
+++ b/src/core/examples/main-callback.cc
@@ -71,7 +71,7 @@ public:
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   // return type: double
diff --git a/src/core/examples/main-ptr.cc b/src/core/examples/main-ptr.cc
index 878163654..f7b6007e2 100644
--- a/src/core/examples/main-ptr.cc
+++ b/src/core/examples/main-ptr.cc
@@ -93,7 +93,7 @@ ClearPtr (void)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   {
diff --git a/src/core/examples/main-random-variable-stream.cc b/src/core/examples/main-random-variable-stream.cc
index d256cd456..685c53a8e 100644
--- a/src/core/examples/main-random-variable-stream.cc
+++ b/src/core/examples/main-random-variable-stream.cc
@@ -107,7 +107,7 @@ Histogram (Ptr<RandomVariableStream> rndvar,
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   unsigned int probes = 1000000;
diff --git a/src/core/examples/main-test-sync.cc b/src/core/examples/main-test-sync.cc
index dc96c37b1..ddda395bf 100644
--- a/src/core/examples/main-test-sync.cc
+++ b/src/core/examples/main-test-sync.cc
@@ -154,7 +154,7 @@ test (void)
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   while (true)
diff --git a/src/core/examples/sample-log-time-format.cc b/src/core/examples/sample-log-time-format.cc
index 65651ab93..eaf51b48b 100644
--- a/src/core/examples/sample-log-time-format.cc
+++ b/src/core/examples/sample-log-time-format.cc
@@ -129,7 +129,7 @@ int main (int argc, char *argv[])
 
   std::map<std::string, Time::Unit> resolutionMap = {{"Time::US", Time::US}, {"Time::NS", Time::NS}, {"Time::PS", Time::PS}, {"Time::FS", Time::FS}};
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("replaceTimePrinter", "replace time printing function", replaceTimePrinter);
   cmd.AddValue ("resolution", "time resolution", resolution);
   cmd.Parse (argc, argv);
diff --git a/src/core/examples/sample-random-variable-stream.cc b/src/core/examples/sample-random-variable-stream.cc
index 315111096..2b79aaa42 100644
--- a/src/core/examples/sample-random-variable-stream.cc
+++ b/src/core/examples/sample-random-variable-stream.cc
@@ -59,7 +59,7 @@ using namespace ns3;
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   // SeedManager::SetRun (3);
diff --git a/src/core/examples/sample-random-variable.cc b/src/core/examples/sample-random-variable.cc
index a3e16ece1..75eef2c5f 100644
--- a/src/core/examples/sample-random-variable.cc
+++ b/src/core/examples/sample-random-variable.cc
@@ -59,7 +59,7 @@ using namespace ns3;
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   // SeedManager::SetRun (3);
diff --git a/src/core/examples/sample-show-progress.cc b/src/core/examples/sample-show-progress.cc
index 9277f0ae9..86d303609 100644
--- a/src/core/examples/sample-show-progress.cc
+++ b/src/core/examples/sample-show-progress.cc
@@ -158,7 +158,7 @@ main (int argc, char ** argv)
   Time wait = MilliSeconds (10);
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("stop", "Simulation duration in virtual time.", stop);
   cmd.AddValue ("interval", "Approximate reporting interval, in wall clock time.", interval);
   cmd.AddValue ("wait", "Wallclock time to burn on each event.", wait);
diff --git a/src/core/examples/sample-simulator.cc b/src/core/examples/sample-simulator.cc
index 72001ed7f..d5a558256 100644
--- a/src/core/examples/sample-simulator.cc
+++ b/src/core/examples/sample-simulator.cc
@@ -102,7 +102,7 @@ CancelledEvent (void)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   MyModel model;
diff --git a/src/create-module.py b/src/create-module.py
index 1d19f21c9..9aa1e38fa 100755
--- a/src/create-module.py
+++ b/src/create-module.py
@@ -125,7 +125,7 @@ main (int argc, char *argv[])
 {
   bool verbose = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "Tell application to log if true", verbose);
 
   cmd.Parse (argc,argv);
diff --git a/src/csma-layout/examples/csma-star.cc b/src/csma-layout/examples/csma-star.cc
index 8df4c1aab..19384da3c 100644
--- a/src/csma-layout/examples/csma-star.cc
+++ b/src/csma-layout/examples/csma-star.cc
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
   Ipv6Address ipv6AddressBase = Ipv6Address("2001::");
   Ipv6Prefix ipv6AddressPrefix = Ipv6Prefix(64);
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nSpokes", "Number of spoke nodes to place in the star", nSpokes);
   cmd.AddValue ("useIpv6", "Use Ipv6", useIpv6);
   cmd.Parse (argc, argv);
diff --git a/src/csma/examples/csma-broadcast.cc b/src/csma/examples/csma-broadcast.cc
index 1042e8850..522114457 100644
--- a/src/csma/examples/csma-broadcast.cc
+++ b/src/csma/examples/csma-broadcast.cc
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Bind()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NS_LOG_INFO ("Create nodes.");
diff --git a/src/csma/examples/csma-multicast.cc b/src/csma/examples/csma-multicast.cc
index 049f1b6f3..1317dc5cc 100644
--- a/src/csma/examples/csma-multicast.cc
+++ b/src/csma/examples/csma-multicast.cc
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults at
   // run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NS_LOG_INFO ("Create nodes.");
diff --git a/src/csma/examples/csma-one-subnet.cc b/src/csma/examples/csma-one-subnet.cc
index 7f2d39d06..cd0d10bab 100644
--- a/src/csma/examples/csma-one-subnet.cc
+++ b/src/csma/examples/csma-one-subnet.cc
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
 // Allow the user to override any of the defaults and the above Bind() at
 // run-time, via command-line arguments
 //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 //
 // Explicitly create the nodes required by the topology (shown above).
diff --git a/src/csma/examples/csma-packet-socket.cc b/src/csma/examples/csma-packet-socket.cc
index 2d84194a0..8f1ccdd3b 100644
--- a/src/csma/examples/csma-packet-socket.cc
+++ b/src/csma/examples/csma-packet-socket.cc
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
   LogComponentEnable ("CsmaPacketSocketExample", LOG_LEVEL_INFO);
 #endif
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   g_os.open ("csma-packet-socket-sink.tr",std::ios_base::binary | std::ios_base::out);
diff --git a/src/csma/examples/csma-ping.cc b/src/csma/examples/csma-ping.cc
index aa2fb29c1..a1ff4bd36 100644
--- a/src/csma/examples/csma-ping.cc
+++ b/src/csma/examples/csma-ping.cc
@@ -53,7 +53,7 @@ int
 main (int argc, char *argv[])
 {
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   // Here, we will explicitly create four nodes.
diff --git a/src/csma/examples/csma-raw-ip-socket.cc b/src/csma/examples/csma-raw-ip-socket.cc
index 669b51a67..4c056981b 100644
--- a/src/csma/examples/csma-raw-ip-socket.cc
+++ b/src/csma/examples/csma-raw-ip-socket.cc
@@ -56,7 +56,7 @@ main (int argc, char *argv[])
   LogComponentEnable ("CsmaPacketSocketExample", LOG_LEVEL_INFO);
 #endif
   uint32_t dataRate = 10;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("dataRate", "application dataRate (Kb/s)", dataRate);
   cmd.Parse (argc, argv);
 
diff --git a/src/dsdv/examples/dsdv-manet.cc b/src/dsdv/examples/dsdv-manet.cc
index 592c573e1..1f1c908d4 100644
--- a/src/dsdv/examples/dsdv-manet.cc
+++ b/src/dsdv/examples/dsdv-manet.cc
@@ -152,7 +152,7 @@ int main (int argc, char **argv)
   bool printRoutingTable = true;
   std::string CSVfileName = "DsdvManetExample.csv";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nWifis", "Number of wifi nodes[Default:30]", nWifis);
   cmd.AddValue ("nSinks", "Number of wifi sink nodes[Default:10]", nSinks);
   cmd.AddValue ("totalTime", "Total Simulation time[Default:100]", totalTime);
diff --git a/src/dsr/examples/dsr.cc b/src/dsr/examples/dsr.cc
index bdaf6b939..0405600e3 100644
--- a/src/dsr/examples/dsr.cc
+++ b/src/dsr/examples/dsr.cc
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
   std::string phyMode ("DsssRate11Mbps");
 
   //Allow users to override the default parameters and set it to new ones from CommandLine.
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nWifis", "Number of wifi nodes", nWifis);
   cmd.AddValue ("nSinks", "Number of SINK traffic nodes", nSinks);
   cmd.AddValue ("rate", "CBR traffic rate(in kbps), Default:8", rate);
diff --git a/src/energy/examples/li-ion-energy-source.cc b/src/energy/examples/li-ion-energy-source.cc
index c130e6b11..e0a104320 100644
--- a/src/energy/examples/li-ion-energy-source.cc
+++ b/src/energy/examples/li-ion-energy-source.cc
@@ -61,7 +61,7 @@ PrintCellInfo (Ptr<LiIonEnergySource> es)
 int
 main (int argc, char **argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
     // uncomment below to see the energy consumption details
diff --git a/src/energy/examples/rv-battery-model-test.cc b/src/energy/examples/rv-battery-model-test.cc
index 8dbd34c00..554b63f1c 100644
--- a/src/energy/examples/rv-battery-model-test.cc
+++ b/src/energy/examples/rv-battery-model-test.cc
@@ -637,7 +637,7 @@ BatteryLifetimeTest::CreateLoadProfiles (void)
 int
 main (int argc, char **argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   NS_LOG_DEBUG ("Constant load run.");
diff --git a/src/fd-net-device/examples/dummy-network.cc b/src/fd-net-device/examples/dummy-network.cc
index 45a5e666b..91b14c6df 100644
--- a/src/fd-net-device/examples/dummy-network.cc
+++ b/src/fd-net-device/examples/dummy-network.cc
@@ -35,7 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("DummyNetworkExample");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   NodeContainer nodes;
diff --git a/src/fd-net-device/examples/fd-emu-onoff.cc b/src/fd-net-device/examples/fd-emu-onoff.cc
index c146f75f5..856f4c402 100644
--- a/src/fd-net-device/examples/fd-emu-onoff.cc
+++ b/src/fd-net-device/examples/fd-emu-onoff.cc
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
   std::string macClient ("00:00:00:00:00:01");
   std::string macServer ("00:00:00:00:00:02");
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("deviceName", "Device name", deviceName);
   cmd.AddValue ("client", "Local IP address (dotted decimal only please)", client);
   cmd.AddValue ("server", "Remote IP address (dotted decimal only please)", server);
diff --git a/src/fd-net-device/examples/fd-emu-ping.cc b/src/fd-net-device/examples/fd-emu-ping.cc
index eb63ad57c..d333c36ce 100644
--- a/src/fd-net-device/examples/fd-emu-ping.cc
+++ b/src/fd-net-device/examples/fd-emu-ping.cc
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults at run-time, via
   // command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("deviceName", "Device name", deviceName);
   cmd.AddValue ("remote", "Remote IP address (dotted decimal only please)", remote);
   cmd.Parse (argc, argv);
diff --git a/src/fd-net-device/examples/fd-emu-udp-echo.cc b/src/fd-net-device/examples/fd-emu-udp-echo.cc
index 556e41397..5179678e9 100644
--- a/src/fd-net-device/examples/fd-emu-udp-echo.cc
+++ b/src/fd-net-device/examples/fd-emu-udp-echo.cc
@@ -97,7 +97,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults at run-time, via command-line
   // arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("client", "client mode", clientMode);
   cmd.AddValue ("server", "server mode", serverMode);
   cmd.AddValue ("deviceName", "device name", deviceName);
diff --git a/src/fd-net-device/examples/fd-planetlab-ping.cc b/src/fd-net-device/examples/fd-planetlab-ping.cc
index 1eb2b066b..50b8e527a 100644
--- a/src/fd-net-device/examples/fd-planetlab-ping.cc
+++ b/src/fd-net-device/examples/fd-planetlab-ping.cc
@@ -90,7 +90,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults at run-time, via
   // command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("remote", "Remote IP address (dotted decimal only please)", remote);
   cmd.AddValue ("tapNetwork", "Network address to assign the TAP device IP address (dotted decimal only please). Note that the network address must be that from the vsys_vnet tag which must exist in your PlanetLab slice.", network);
   cmd.AddValue ("tapMask", "Network mask for configure the TAP device (dotted decimal only please)", mask);
diff --git a/src/fd-net-device/examples/fd-tap-ping.cc b/src/fd-net-device/examples/fd-tap-ping.cc
index ca47e5ee0..bb5a9d2bc 100644
--- a/src/fd-net-device/examples/fd-tap-ping.cc
+++ b/src/fd-net-device/examples/fd-tap-ping.cc
@@ -103,7 +103,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults at run-time, via
   // command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("deviceName", "Device name", deviceName);
   cmd.AddValue ("remote", "Remote IP address (dotted decimal only please)", remote);
   cmd.AddValue ("tapNetwork", "Network address to assign the TAP device IP address (dotted decimal only please)", network);
diff --git a/src/fd-net-device/examples/fd-tap-ping6.cc b/src/fd-net-device/examples/fd-tap-ping6.cc
index 3bfac1bf7..2274e68c2 100644
--- a/src/fd-net-device/examples/fd-tap-ping6.cc
+++ b/src/fd-net-device/examples/fd-tap-ping6.cc
@@ -60,7 +60,7 @@ NS_LOG_COMPONENT_DEFINE ("TAPPing6Example");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   NS_LOG_INFO ("Ping6 Emulation Example with TAP");
diff --git a/src/fd-net-device/examples/fd2fd-onoff.cc b/src/fd-net-device/examples/fd2fd-onoff.cc
index 999b2693b..4b328787e 100644
--- a/src/fd-net-device/examples/fd2fd-onoff.cc
+++ b/src/fd-net-device/examples/fd2fd-onoff.cc
@@ -61,7 +61,7 @@ main (int argc, char *argv[])
   // Command-line arguments
   //
   bool tcpMode = false;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("tcpMode", "1:true, 0:false, default mode UDP",tcpMode);
   cmd.Parse (argc, argv);
    
diff --git a/src/fd-net-device/examples/realtime-dummy-network.cc b/src/fd-net-device/examples/realtime-dummy-network.cc
index 178ad184b..5f0bab3de 100644
--- a/src/fd-net-device/examples/realtime-dummy-network.cc
+++ b/src/fd-net-device/examples/realtime-dummy-network.cc
@@ -35,7 +35,7 @@ NS_LOG_COMPONENT_DEFINE ("RealtimeDummyNetworkExample");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   GlobalValue::Bind ("SimulatorImplementationType", StringValue ("ns3::RealtimeSimulatorImpl"));
diff --git a/src/fd-net-device/examples/realtime-fd2fd-onoff.cc b/src/fd-net-device/examples/realtime-fd2fd-onoff.cc
index 2b91da137..e2ae56cc4 100644
--- a/src/fd-net-device/examples/realtime-fd2fd-onoff.cc
+++ b/src/fd-net-device/examples/realtime-fd2fd-onoff.cc
@@ -56,7 +56,7 @@ NS_LOG_COMPONENT_DEFINE ("RealtimeFdNetDeviceSaturationExample");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   uint16_t sinkPort = 8000;
diff --git a/src/internet-apps/examples/dhcp-example.cc b/src/internet-apps/examples/dhcp-example.cc
index 3f8e150e8..4c8a8f471 100644
--- a/src/internet-apps/examples/dhcp-example.cc
+++ b/src/internet-apps/examples/dhcp-example.cc
@@ -36,7 +36,7 @@ NS_LOG_COMPONENT_DEFINE ("DhcpExample");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   bool verbose = false;
   bool tracing = false;
diff --git a/src/internet-apps/examples/traceroute-example.cc b/src/internet-apps/examples/traceroute-example.cc
index 0e4307777..6695ec021 100644
--- a/src/internet-apps/examples/traceroute-example.cc
+++ b/src/internet-apps/examples/traceroute-example.cc
@@ -131,7 +131,7 @@ TracerouteExample::Configure (int argc, char **argv)
   // LogComponentEnable("AodvRoutingProtocol", LOG_LEVEL_ALL);
 
   SeedManager::SetSeed (12345);
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.AddValue ("pcap", "Write PCAP traces.", pcap);
   cmd.AddValue ("printRoutes", "Print routing table dumps.", printRoutes);
diff --git a/src/internet/examples/main-simple.cc b/src/internet/examples/main-simple.cc
index e09b72534..1d4704046 100644
--- a/src/internet/examples/main-simple.cc
+++ b/src/internet/examples/main-simple.cc
@@ -87,7 +87,7 @@ RunSimulation (void)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   RunSimulation ();
diff --git a/src/lr-wpan/examples/lr-wpan-data.cc b/src/lr-wpan/examples/lr-wpan-data.cc
index 447943df6..44fd6e612 100644
--- a/src/lr-wpan/examples/lr-wpan-data.cc
+++ b/src/lr-wpan/examples/lr-wpan-data.cc
@@ -61,7 +61,7 @@ int main (int argc, char *argv[])
   bool verbose = false;
   bool extended = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.AddValue ("verbose", "turn on all log components", verbose);
   cmd.AddValue ("extended", "use extended addressing", extended);
diff --git a/src/lr-wpan/examples/lr-wpan-error-distance-plot.cc b/src/lr-wpan/examples/lr-wpan-error-distance-plot.cc
index 474248612..c8365f45d 100644
--- a/src/lr-wpan/examples/lr-wpan-error-distance-plot.cc
+++ b/src/lr-wpan/examples/lr-wpan-error-distance-plot.cc
@@ -77,7 +77,7 @@ int main (int argc, char *argv[])
   double txPower = 0;
   uint32_t channelNumber = 11;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.AddValue ("txPower", "transmit power (dBm)", txPower);
   cmd.AddValue ("packetSize", "packet (MSDU) size (bytes)", packetSize);
diff --git a/src/lr-wpan/examples/lr-wpan-phy-test.cc b/src/lr-wpan/examples/lr-wpan-phy-test.cc
index d4b838c07..6aa49daa8 100644
--- a/src/lr-wpan/examples/lr-wpan-phy-test.cc
+++ b/src/lr-wpan/examples/lr-wpan-phy-test.cc
@@ -55,7 +55,7 @@ void SendOnePacket (Ptr<LrWpanPhy> sender, Ptr<LrWpanPhy> receiver)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   LogComponentEnableAll (LOG_PREFIX_FUNC);
diff --git a/src/lte/doc/source/lte-user.rst b/src/lte/doc/source/lte-user.rst
index 5b765be66..2174b0819 100644
--- a/src/lte/doc/source/lte-user.rst
+++ b/src/lte/doc/source/lte-user.rst
@@ -152,7 +152,7 @@ how to do it using input files together with the ns-3 ConfigStore.
 First of all, you need to put the following in your simulation
 program, right after ``main ()`` starts::
 
-      CommandLine cmd;
+      COMMANDLINE (cmd);
       cmd.Parse (argc, argv);
       ConfigStore inputConfig;
       inputConfig.ConfigureDefaults ();
diff --git a/src/lte/examples/lena-cc-helper.cc b/src/lte/examples/lena-cc-helper.cc
index 741c4788a..782df22dc 100644
--- a/src/lte/examples/lena-cc-helper.cc
+++ b/src/lte/examples/lena-cc-helper.cc
@@ -32,7 +32,7 @@ void Print ( ComponentCarrier cc);
 
 int main (int argc, char *argv[])
 {	
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 	
   Config::SetDefault ("ns3::ComponentCarrier::UlBandwidth", UintegerValue (50));
diff --git a/src/lte/examples/lena-cqi-threshold.cc b/src/lte/examples/lena-cqi-threshold.cc
index 01af6625b..099d7155d 100644
--- a/src/lte/examples/lena-cqi-threshold.cc
+++ b/src/lte/examples/lena-cqi-threshold.cc
@@ -63,7 +63,7 @@ ChangePosition (Ptr<Node> node)
 
 int main (int argc, char *argv[])
 {	
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 	
   // to save a template default attribute file run it like this:
diff --git a/src/lte/examples/lena-deactivate-bearer.cc b/src/lte/examples/lena-deactivate-bearer.cc
index 41c1cb364..be40119f6 100644
--- a/src/lte/examples/lena-deactivate-bearer.cc
+++ b/src/lte/examples/lena-deactivate-bearer.cc
@@ -50,7 +50,7 @@ main (int argc, char *argv[])
   double interPacketInterval = 100;
 
   // Command line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("numberOfNodes", "Number of eNodeBs + UE pairs", numberOfNodes);
   cmd.AddValue ("simTime", "Total duration of the simulation [s])", simTime);
   cmd.AddValue ("distance", "Distance between eNBs [m]", distance);
diff --git a/src/lte/examples/lena-distributed-ffr.cc b/src/lte/examples/lena-distributed-ffr.cc
index de364d5d4..6b69a12e4 100644
--- a/src/lte/examples/lena-distributed-ffr.cc
+++ b/src/lte/examples/lena-distributed-ffr.cc
@@ -116,7 +116,7 @@ int main (int argc, char *argv[])
   Box macroUeBox = Box (-distance * 0.5, distance * 1.5, -distance * 0.5, distance * 1.5, 1.5, 1.5);
 
   // Command line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("numberOfUes", "Number of UEs", numberOfRandomUes);
   cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime);
   cmd.AddValue ("generateSpectrumTrace", "if true, will generate a Spectrum Analyzer trace", generateSpectrumTrace);
diff --git a/src/lte/examples/lena-dual-stripe.cc b/src/lte/examples/lena-dual-stripe.cc
index 7801d6089..049e668cd 100644
--- a/src/lte/examples/lena-dual-stripe.cc
+++ b/src/lte/examples/lena-dual-stripe.cc
@@ -382,7 +382,7 @@ main (int argc, char *argv[])
   Config::SetDefault ("ns3::UdpClient::MaxPackets", UintegerValue (1000000));
   Config::SetDefault ("ns3::LteRlcUm::MaxTxBufferSize", UintegerValue (10 * 1024));
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   ConfigStore inputConfig;
   inputConfig.ConfigureDefaults ();
diff --git a/src/lte/examples/lena-fading.cc b/src/lte/examples/lena-fading.cc
index a6501b8fa..7929fd9af 100644
--- a/src/lte/examples/lena-fading.cc
+++ b/src/lte/examples/lena-fading.cc
@@ -33,7 +33,7 @@ using namespace ns3;
 
 int main (int argc, char *argv[])
 {	
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 	
   // to save a template default attribute file run it like this:
diff --git a/src/lte/examples/lena-frequency-reuse.cc b/src/lte/examples/lena-frequency-reuse.cc
index c702a971f..3f676c44e 100644
--- a/src/lte/examples/lena-frequency-reuse.cc
+++ b/src/lte/examples/lena-frequency-reuse.cc
@@ -112,7 +112,7 @@ int main (int argc, char *argv[])
   Box macroUeBox = Box (-distance * 0.5, distance * 1.5, -distance * 0.5, distance * 1.5, 1.5, 1.5);
 
   // Command line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("numberOfUes", "Number of random UEs", numberOfRandomUes);
   cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime);
   cmd.AddValue ("generateSpectrumTrace", "if true, will generate a Spectrum Analyzer trace", generateSpectrumTrace);
diff --git a/src/lte/examples/lena-intercell-interference.cc b/src/lte/examples/lena-intercell-interference.cc
index 193bcf056..dc6120422 100644
--- a/src/lte/examples/lena-intercell-interference.cc
+++ b/src/lte/examples/lena-intercell-interference.cc
@@ -44,7 +44,7 @@ int main (int argc, char *argv[])
   uint32_t numUes = 1;
   double simTime = 1.0;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("enbDist", "distance between the two eNBs", enbDist);
   cmd.AddValue ("radius", "the radius of the disc where UEs are placed around an eNB", radius);
   cmd.AddValue ("numUes", "how many UEs are attached to each eNB", numUes);
diff --git a/src/lte/examples/lena-ipv6-addr-conf.cc b/src/lte/examples/lena-ipv6-addr-conf.cc
index 73236686b..5bc6445c1 100644
--- a/src/lte/examples/lena-ipv6-addr-conf.cc
+++ b/src/lte/examples/lena-ipv6-addr-conf.cc
@@ -44,7 +44,7 @@ NS_LOG_COMPONENT_DEFINE ("EpcFirstExampleForIpv6");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
diff --git a/src/lte/examples/lena-ipv6-ue-rh.cc b/src/lte/examples/lena-ipv6-ue-rh.cc
index 6b40c7582..3ba7179ba 100644
--- a/src/lte/examples/lena-ipv6-ue-rh.cc
+++ b/src/lte/examples/lena-ipv6-ue-rh.cc
@@ -43,7 +43,7 @@ NS_LOG_COMPONENT_DEFINE ("EpcFirstExampleForIpv6");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
diff --git a/src/lte/examples/lena-ipv6-ue-ue.cc b/src/lte/examples/lena-ipv6-ue-ue.cc
index c755f8b5e..9d5c5862d 100644
--- a/src/lte/examples/lena-ipv6-ue-ue.cc
+++ b/src/lte/examples/lena-ipv6-ue-ue.cc
@@ -44,7 +44,7 @@ NS_LOG_COMPONENT_DEFINE ("EpcSecondExampleForIpv6");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
diff --git a/src/lte/examples/lena-pathloss-traces.cc b/src/lte/examples/lena-pathloss-traces.cc
index ed5a6a14c..dfe069809 100644
--- a/src/lte/examples/lena-pathloss-traces.cc
+++ b/src/lte/examples/lena-pathloss-traces.cc
@@ -45,7 +45,7 @@ int main (int argc, char *argv[])
   uint32_t numUes = 1;
 
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("enbDist", "distance between the two eNBs", enbDist);
   cmd.AddValue ("radius", "the radius of the disc where UEs are placed around an eNB", radius);
   cmd.AddValue ("numUes", "how many UEs are attached to each eNB", numUes);
diff --git a/src/lte/examples/lena-profiling.cc b/src/lte/examples/lena-profiling.cc
index 856d90359..91a923ee1 100644
--- a/src/lte/examples/lena-profiling.cc
+++ b/src/lte/examples/lena-profiling.cc
@@ -38,7 +38,7 @@ main (int argc, char *argv[])
   uint32_t nUe = 1;
   uint32_t nFloors = 0;
   double simTime = 1.0;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.AddValue ("nEnb", "Number of eNodeBs per floor", nEnbPerFloor);
   cmd.AddValue ("nUe", "Number of UEs", nUe);
diff --git a/src/lte/examples/lena-radio-link-failure.cc b/src/lte/examples/lena-radio-link-failure.cc
index e1423d864..aec9a5515 100644
--- a/src/lte/examples/lena-radio-link-failure.cc
+++ b/src/lte/examples/lena-radio-link-failure.cc
@@ -276,7 +276,7 @@ main (int argc, char *argv[])
   bool enableDataErrorModel = true;
   bool enableNsLogs = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime);
   cmd.AddValue ("numberOfEnbs", "Number of eNBs", numberOfEnbs);
   cmd.AddValue ("n311", "Number of in-synch indication", n311);
diff --git a/src/lte/examples/lena-rem-sector-antenna.cc b/src/lte/examples/lena-rem-sector-antenna.cc
index c3d002e99..fcdde7c4f 100644
--- a/src/lte/examples/lena-rem-sector-antenna.cc
+++ b/src/lte/examples/lena-rem-sector-antenna.cc
@@ -37,7 +37,7 @@ using std::vector;
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   ConfigStore inputConfig;
diff --git a/src/lte/examples/lena-rem.cc b/src/lte/examples/lena-rem.cc
index 87eba3a2f..e4066b9bc 100644
--- a/src/lte/examples/lena-rem.cc
+++ b/src/lte/examples/lena-rem.cc
@@ -33,7 +33,7 @@ using namespace ns3;
 
 int main (int argc, char *argv[])
 {	
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 	
   // to save a template default attribute file run it like this:
diff --git a/src/lte/examples/lena-rlc-traces.cc b/src/lte/examples/lena-rlc-traces.cc
index 736e4bb07..6e6403bcb 100644
--- a/src/lte/examples/lena-rlc-traces.cc
+++ b/src/lte/examples/lena-rlc-traces.cc
@@ -31,7 +31,7 @@ using namespace ns3;
 int main (int argc, char *argv[])
 {
   // Command line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   ConfigStore inputConfig;
diff --git a/src/lte/examples/lena-simple-epc-backhaul.cc b/src/lte/examples/lena-simple-epc-backhaul.cc
index 43b846c9b..cfb868287 100644
--- a/src/lte/examples/lena-simple-epc-backhaul.cc
+++ b/src/lte/examples/lena-simple-epc-backhaul.cc
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
   bool useHelper = false;
 
   // Command line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("numNodePairs", "Number of eNodeBs + UE pairs", numNodePairs);
   cmd.AddValue ("simTime", "Total duration of the simulation", simTime);
   cmd.AddValue ("distance", "Distance between eNBs [m]", distance);
diff --git a/src/lte/examples/lena-simple-epc-emu.cc b/src/lte/examples/lena-simple-epc-emu.cc
index 02be324e2..376566438 100644
--- a/src/lte/examples/lena-simple-epc-emu.cc
+++ b/src/lte/examples/lena-simple-epc-emu.cc
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
   double interPacketInterval = 1000;
 
   // Command line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue("nEnbs", "Number of eNBs", nEnbs);
   cmd.AddValue("nUesPerEnb", "Number of UEs per eNB", nUesPerEnb);
   cmd.AddValue("simTime", "Total duration of the simulation [s])", simTime);
diff --git a/src/lte/examples/lena-simple-epc.cc b/src/lte/examples/lena-simple-epc.cc
index f21e06193..88f5ec26f 100644
--- a/src/lte/examples/lena-simple-epc.cc
+++ b/src/lte/examples/lena-simple-epc.cc
@@ -51,7 +51,7 @@ main (int argc, char *argv[])
   bool disablePl = false;
 
   // Command line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("numNodePairs", "Number of eNodeBs + UE pairs", numNodePairs);
   cmd.AddValue ("simTime", "Total duration of the simulation", simTime);
   cmd.AddValue ("distance", "Distance between eNBs [m]", distance);
diff --git a/src/lte/examples/lena-simple.cc b/src/lte/examples/lena-simple.cc
index 1394fdabd..45a76c118 100644
--- a/src/lte/examples/lena-simple.cc
+++ b/src/lte/examples/lena-simple.cc
@@ -33,7 +33,7 @@ int main (int argc, char *argv[])
   Time simTime = MilliSeconds (1050);
   bool useCa = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simTime", "Total duration of the simulation", simTime);
   cmd.AddValue ("useCa", "Whether to use carrier aggregation.", useCa);
   cmd.Parse (argc, argv);
diff --git a/src/lte/examples/lena-uplink-power-control.cc b/src/lte/examples/lena-uplink-power-control.cc
index ebce38325..d3e04a353 100644
--- a/src/lte/examples/lena-uplink-power-control.cc
+++ b/src/lte/examples/lena-uplink-power-control.cc
@@ -45,7 +45,7 @@ int main (int argc, char *argv[])
   Config::SetDefault ("ns3::LteUePowerControl::AccumulationEnabled", BooleanValue (true));
   Config::SetDefault ("ns3::LteUePowerControl::Alpha", DoubleValue (1.0));
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
diff --git a/src/lte/examples/lena-x2-handover-measures.cc b/src/lte/examples/lena-x2-handover-measures.cc
index 993b8f6fe..ccb21966e 100644
--- a/src/lte/examples/lena-x2-handover-measures.cc
+++ b/src/lte/examples/lena-x2-handover-measures.cc
@@ -158,7 +158,7 @@ main (int argc, char *argv[])
   Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (true));
 
   // Command line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime);
   cmd.AddValue ("speed", "Speed of the UE (default = 20 m/s)", speed);
   cmd.AddValue ("enbTxPowerDbm", "TX power [dBm] used by HeNBs (default = 46.0)", enbTxPowerDbm);
diff --git a/src/lte/examples/lena-x2-handover.cc b/src/lte/examples/lena-x2-handover.cc
index 7aa902c64..ce58ce8aa 100644
--- a/src/lte/examples/lena-x2-handover.cc
+++ b/src/lte/examples/lena-x2-handover.cc
@@ -153,7 +153,7 @@ main (int argc, char *argv[])
   Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (false));
 
   // Command line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("numberOfUes", "Number of UEs", numberOfUes);
   cmd.AddValue ("numberOfEnbs", "Number of eNodeBs", numberOfEnbs);
   cmd.AddValue ("simTime", "Total duration of the simulation", simTime);
diff --git a/src/mesh/examples/mesh.cc b/src/mesh/examples/mesh.cc
index 431860e09..bb594c04b 100644
--- a/src/mesh/examples/mesh.cc
+++ b/src/mesh/examples/mesh.cc
@@ -131,7 +131,7 @@ MeshTest::MeshTest () :
 void
 MeshTest::Configure (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("x-size", "Number of nodes in a row grid", m_xSize);
   cmd.AddValue ("y-size", "Number of rows in a grid", m_ySize);
   cmd.AddValue ("step",   "Size of edge in our grid (meters)", m_step);
diff --git a/src/mobility/examples/bonnmotion-ns2-example.cc b/src/mobility/examples/bonnmotion-ns2-example.cc
index 2a63d7aa8..e601532e2 100644
--- a/src/mobility/examples/bonnmotion-ns2-example.cc
+++ b/src/mobility/examples/bonnmotion-ns2-example.cc
@@ -67,7 +67,7 @@ int main (int argc, char *argv[])
   double deltaTime = 100;
   std::string traceFile = "src/mobility/examples/bonnmotion.ns_movements";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("traceFile", "Ns2 movement trace file", traceFile);
   cmd.AddValue ("deltaTime", "time interval (s) between updates (default 100)", deltaTime);
   cmd.Parse (argc, argv);
diff --git a/src/mobility/examples/main-grid-topology.cc b/src/mobility/examples/main-grid-topology.cc
index 99f2fb796..39ddaac8b 100644
--- a/src/mobility/examples/main-grid-topology.cc
+++ b/src/mobility/examples/main-grid-topology.cc
@@ -25,7 +25,7 @@ using namespace ns3;
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NodeContainer nodes;
diff --git a/src/mobility/examples/main-random-topology.cc b/src/mobility/examples/main-random-topology.cc
index 3f017341d..79e480c37 100644
--- a/src/mobility/examples/main-random-topology.cc
+++ b/src/mobility/examples/main-random-topology.cc
@@ -32,7 +32,7 @@ CourseChange (std::string context, Ptr<const MobilityModel> position)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
 
diff --git a/src/mobility/examples/main-random-walk.cc b/src/mobility/examples/main-random-walk.cc
index 39deb49e7..0f56921eb 100644
--- a/src/mobility/examples/main-random-walk.cc
+++ b/src/mobility/examples/main-random-walk.cc
@@ -38,7 +38,7 @@ int main (int argc, char *argv[])
   Config::SetDefault ("ns3::RandomWalk2dMobilityModel::Speed", StringValue ("ns3::ConstantRandomVariable[Constant=1.0]"));
   Config::SetDefault ("ns3::RandomWalk2dMobilityModel::Bounds", StringValue ("0|200|0|200"));
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NodeContainer c;
diff --git a/src/mobility/examples/mobility-trace-example.cc b/src/mobility/examples/mobility-trace-example.cc
index 8f004af19..656457ef1 100644
--- a/src/mobility/examples/mobility-trace-example.cc
+++ b/src/mobility/examples/mobility-trace-example.cc
@@ -26,7 +26,7 @@ using namespace ns3;
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   NodeContainer sta;
diff --git a/src/mobility/examples/ns2-mobility-trace.cc b/src/mobility/examples/ns2-mobility-trace.cc
index 54296accd..b509af7f4 100644
--- a/src/mobility/examples/ns2-mobility-trace.cc
+++ b/src/mobility/examples/ns2-mobility-trace.cc
@@ -83,7 +83,7 @@ int main (int argc, char *argv[])
   LogComponentEnable ("Ns2MobilityHelper",LOG_LEVEL_DEBUG);
 
   // Parse command line attribute
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("traceFile", "Ns2 movement trace file", traceFile);
   cmd.AddValue ("nodeNum", "Number of nodes", nodeNum);
   cmd.AddValue ("duration", "Duration of Simulation", duration);
diff --git a/src/mpi/examples/nms-p2p-nix-distributed.cc b/src/mpi/examples/nms-p2p-nix-distributed.cc
index 4a16c05e6..9e7647c98 100644
--- a/src/mpi/examples/nms-p2p-nix-distributed.cc
+++ b/src/mpi/examples/nms-p2p-nix-distributed.cc
@@ -91,7 +91,7 @@ main (int argc, char *argv[])
   int nBytes = 500000; // Bytes for each on/off app
   bool nix = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("CN", "Number of total CNs [2]", nCN);
   cmd.AddValue ("LAN", "Number of nodes per LAN [42]", nLANClients);
   cmd.AddValue ("single", "1 if use single flow", single);
diff --git a/src/mpi/examples/simple-distributed-empty-node.cc b/src/mpi/examples/simple-distributed-empty-node.cc
index 1643b93b9..831989489 100644
--- a/src/mpi/examples/simple-distributed-empty-node.cc
+++ b/src/mpi/examples/simple-distributed-empty-node.cc
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
   bool tracing = false;
 
   // Parse command line
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nix", "Enable the use of nix-vector or global routing", nix);
   cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization", nullmsg);
   cmd.AddValue ("tracing", "Enable pcap tracing", tracing);
diff --git a/src/mpi/examples/simple-distributed.cc b/src/mpi/examples/simple-distributed.cc
index a3f810040..9e03fd035 100644
--- a/src/mpi/examples/simple-distributed.cc
+++ b/src/mpi/examples/simple-distributed.cc
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
   bool tracing = false;
 
   // Parse command line
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nix", "Enable the use of nix-vector or global routing", nix);
   cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization", nullmsg);
   cmd.AddValue ("tracing", "Enable pcap tracing", tracing);
diff --git a/src/mpi/examples/third-distributed.cc b/src/mpi/examples/third-distributed.cc
index 1e44a3a5c..97cbe8652 100644
--- a/src/mpi/examples/third-distributed.cc
+++ b/src/mpi/examples/third-distributed.cc
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
   bool tracing = false;
   bool nullmsg = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma);
   cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi);
   cmd.AddValue ("verbose", "Tell echo applications to log if true", verbose);
diff --git a/src/netanim/examples/colors-link-description.cc b/src/netanim/examples/colors-link-description.cc
index 03891061f..4f7f8e221 100644
--- a/src/netanim/examples/colors-link-description.cc
+++ b/src/netanim/examples/colors-link-description.cc
@@ -90,7 +90,7 @@ int main (int argc, char *argv[])
   uint32_t    nLeaf = 0; // If non-zero, number of both left and right
   std::string animFile = "dynamic_linknode.xml" ;  // Name of file for animation output
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nLeftLeaf", "Number of left side leaf nodes", nLeftLeaf);
   cmd.AddValue ("nRightLeaf","Number of right side leaf nodes", nRightLeaf);
   cmd.AddValue ("nLeaf",     "Number of left and right side leaf nodes", nLeaf);
diff --git a/src/netanim/examples/dumbbell-animation.cc b/src/netanim/examples/dumbbell-animation.cc
index 40956d93a..df1e635b5 100644
--- a/src/netanim/examples/dumbbell-animation.cc
+++ b/src/netanim/examples/dumbbell-animation.cc
@@ -38,7 +38,7 @@ int main (int argc, char *argv[])
   uint32_t    nLeaf = 0; // If non-zero, number of both left and right
   std::string animFile = "dumbbell-animation.xml" ;  // Name of file for animation output
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nLeftLeaf", "Number of left side leaf nodes", nLeftLeaf);
   cmd.AddValue ("nRightLeaf","Number of right side leaf nodes", nRightLeaf);
   cmd.AddValue ("nLeaf",     "Number of left and right side leaf nodes", nLeaf);
diff --git a/src/netanim/examples/grid-animation.cc b/src/netanim/examples/grid-animation.cc
index 2432d1802..9dbfb3125 100644
--- a/src/netanim/examples/grid-animation.cc
+++ b/src/netanim/examples/grid-animation.cc
@@ -37,7 +37,7 @@ int main (int argc, char *argv[])
   uint32_t ySize = 5;
   std::string animFile = "grid-animation.xml";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("xSize", "Number of rows of nodes", xSize);
   cmd.AddValue ("ySize", "Number of columns of nodes", ySize);
   cmd.AddValue ("animFile",  "File Name for Animation Output", animFile);
diff --git a/src/netanim/examples/resources-counters.cc b/src/netanim/examples/resources-counters.cc
index f51705e30..6ccf20efb 100644
--- a/src/netanim/examples/resources-counters.cc
+++ b/src/netanim/examples/resources-counters.cc
@@ -116,7 +116,7 @@ int main (int argc, char *argv[])
   uint32_t    nLeaf = 0; // If non-zero, number of both left and right
   std::string animFile = "resources_demo.xml" ;  // Name of file for animation output
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nLeftLeaf", "Number of left side leaf nodes", nLeftLeaf);
   cmd.AddValue ("nRightLeaf","Number of right side leaf nodes", nRightLeaf);
   cmd.AddValue ("nLeaf",     "Number of left and right side leaf nodes", nLeaf);
diff --git a/src/netanim/examples/star-animation.cc b/src/netanim/examples/star-animation.cc
index cbd128111..011570689 100644
--- a/src/netanim/examples/star-animation.cc
+++ b/src/netanim/examples/star-animation.cc
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
   Ipv6Address ipv6AddressBase = Ipv6Address("2001::");
   Ipv6Prefix ipv6AddressPrefix = Ipv6Prefix(64);
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nSpokes", "Number of spoke nodes to place in the star", nSpokes);
   cmd.AddValue ("animFile",  "File Name for Animation Output", animFile);
   cmd.AddValue ("useIpv6",   "use Ipv6", useIpv6);
diff --git a/src/netanim/examples/uan-animation.cc b/src/netanim/examples/uan-animation.cc
index 0e99194b2..2c68ae089 100644
--- a/src/netanim/examples/uan-animation.cc
+++ b/src/netanim/examples/uan-animation.cc
@@ -261,7 +261,7 @@ main (int argc, char **argv)
   std::string perModel = "ns3::UanPhyPerGenDefault";
   std::string sinrModel = "ns3::UanPhyCalcSinrDefault";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("NumNodes", "Number of transmitting nodes", exp.m_numNodes);
   cmd.AddValue ("Depth", "Depth of transmitting and sink nodes", exp.m_depth);
   cmd.AddValue ("RegionSize", "Size of boundary in meters", exp.m_boundary);
diff --git a/src/netanim/examples/wireless-animation.cc b/src/netanim/examples/wireless-animation.cc
index 566c90566..5816fa028 100644
--- a/src/netanim/examples/wireless-animation.cc
+++ b/src/netanim/examples/wireless-animation.cc
@@ -38,7 +38,7 @@ int
 main (int argc, char *argv[])
 {
   uint32_t nWifi = 20;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi);
 
   cmd.Parse (argc,argv);
diff --git a/src/network/examples/packet-socket-apps.cc b/src/network/examples/packet-socket-apps.cc
index 4644b8853..4c015ecf2 100644
--- a/src/network/examples/packet-socket-apps.cc
+++ b/src/network/examples/packet-socket-apps.cc
@@ -40,7 +40,7 @@ int main (int argc, char *argv[])
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse(argc, argv);
 
diff --git a/src/nix-vector-routing/examples/nix-simple.cc b/src/nix-vector-routing/examples/nix-simple.cc
index 2f0aa97c5..76bdf9e0b 100644
--- a/src/nix-vector-routing/examples/nix-simple.cc
+++ b/src/nix-vector-routing/examples/nix-simple.cc
@@ -45,7 +45,7 @@ NS_LOG_COMPONENT_DEFINE ("NixSimpleExample");
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   LogComponentEnable ("UdpEchoClientApplication", LOG_LEVEL_INFO);
diff --git a/src/nix-vector-routing/examples/nms-p2p-nix.cc b/src/nix-vector-routing/examples/nms-p2p-nix.cc
index 1768d0d09..c69b33f6b 100644
--- a/src/nix-vector-routing/examples/nms-p2p-nix.cc
+++ b/src/nix-vector-routing/examples/nms-p2p-nix.cc
@@ -158,7 +158,7 @@ main (int argc, char *argv[])
   int nCN = 2, nLANClients = 42;
   bool nix = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("CN", "Number of total CNs [2]", nCN);
   cmd.AddValue ("LAN", "Number of nodes per LAN [42]", nLANClients);
   cmd.AddValue ("NIX", "Toggle nix-vector routing", nix);
diff --git a/src/olsr/examples/olsr-hna.cc b/src/olsr/examples/olsr-hna.cc
index 56b13af9e..58bfb2bdd 100644
--- a/src/olsr/examples/olsr-hna.cc
+++ b/src/olsr/examples/olsr-hna.cc
@@ -100,7 +100,7 @@ int main (int argc, char *argv[])
   bool assocMethod1 = false;
   bool assocMethod2 = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("rss", "received signal strength", rss);
diff --git a/src/olsr/examples/simple-point-to-point-olsr.cc b/src/olsr/examples/simple-point-to-point-olsr.cc
index 495f38c55..7e79b42cb 100644
--- a/src/olsr/examples/simple-point-to-point-olsr.cc
+++ b/src/olsr/examples/simple-point-to-point-olsr.cc
@@ -71,7 +71,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // DefaultValue::Bind ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   // Here, we will explicitly create four nodes.  In more sophisticated
diff --git a/src/openflow/examples/openflow-switch.cc b/src/openflow/examples/openflow-switch.cc
index 5a6afd03b..6b4d77613 100644
--- a/src/openflow/examples/openflow-switch.cc
+++ b/src/openflow/examples/openflow-switch.cc
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults and the above Bind() at
   // run-time, via command-line arguments
   //
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("v", "Verbose (turns on logging).", MakeCallback (&SetVerbose));
   cmd.AddValue ("verbose", "Verbose (turns on logging).", MakeCallback (&SetVerbose));
   cmd.AddValue ("d", "Use Drop Controller (Learning if not specified).", MakeCallback (&SetDrop));
diff --git a/src/point-to-point/examples/main-attribute-value.cc b/src/point-to-point/examples/main-attribute-value.cc
index 158f10984..996149043 100644
--- a/src/point-to-point/examples/main-attribute-value.cc
+++ b/src/point-to-point/examples/main-attribute-value.cc
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
   // Allow the user to override any of the defaults and the above
   // SetDefaults() at run-time, via command-line arguments
   // For example, via "--ns3::DropTailQueue<Packet>::MaxSize=80p"
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   // This provides yet another way to set the value from the command line:
   cmd.AddValue ("maxSize", "ns3::DropTailQueue<Packet>::MaxSize");
   cmd.Parse (argc, argv);
diff --git a/src/propagation/examples/jakes-propagation-model-example.cc b/src/propagation/examples/jakes-propagation-model-example.cc
index 15ac9b536..bb2a8cb38 100644
--- a/src/propagation/examples/jakes-propagation-model-example.cc
+++ b/src/propagation/examples/jakes-propagation-model-example.cc
@@ -69,7 +69,7 @@ void JakesPropagationExample::Next ()
 int main (int argc, char *argv[])
 {
   Config::SetDefault ("ns3::JakesProcess::NumberOfOscillators", UintegerValue (100));
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   JakesPropagationExample example;
   Simulator::Stop (Seconds (1000));
diff --git a/src/propagation/examples/main-propagation-loss.cc b/src/propagation/examples/main-propagation-loss.cc
index ad2d6a342..ca5435266 100644
--- a/src/propagation/examples/main-propagation-loss.cc
+++ b/src/propagation/examples/main-propagation-loss.cc
@@ -219,7 +219,7 @@ TestDeterministicByTime (Ptr<PropagationLossModel> model,
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   GnuplotCollection gnuplots ("main-propagation-loss.pdf");
diff --git a/src/sixlowpan/examples/example-ping-lr-wpan-beacon.cc b/src/sixlowpan/examples/example-ping-lr-wpan-beacon.cc
index 0eb43f19d..8d7643843 100644
--- a/src/sixlowpan/examples/example-ping-lr-wpan-beacon.cc
+++ b/src/sixlowpan/examples/example-ping-lr-wpan-beacon.cc
@@ -48,7 +48,7 @@ int main (int argc, char** argv)
 
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/src/sixlowpan/examples/example-ping-lr-wpan-mesh-under.cc b/src/sixlowpan/examples/example-ping-lr-wpan-mesh-under.cc
index 4758a113f..008741914 100644
--- a/src/sixlowpan/examples/example-ping-lr-wpan-mesh-under.cc
+++ b/src/sixlowpan/examples/example-ping-lr-wpan-mesh-under.cc
@@ -37,7 +37,7 @@ int main (int argc, char** argv)
 
   Packet::EnablePrinting ();
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/src/sixlowpan/examples/example-ping-lr-wpan.cc b/src/sixlowpan/examples/example-ping-lr-wpan.cc
index 9ee16dccc..7b1f5ff06 100644
--- a/src/sixlowpan/examples/example-ping-lr-wpan.cc
+++ b/src/sixlowpan/examples/example-ping-lr-wpan.cc
@@ -37,7 +37,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on log components", verbose);
   cmd.Parse (argc, argv);
   
diff --git a/src/sixlowpan/examples/example-sixlowpan.cc b/src/sixlowpan/examples/example-sixlowpan.cc
index 6569a19ab..242a14229 100644
--- a/src/sixlowpan/examples/example-sixlowpan.cc
+++ b/src/sixlowpan/examples/example-sixlowpan.cc
@@ -53,7 +53,7 @@ int main (int argc, char** argv)
 {
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "turn on some relevant log components", verbose);
   cmd.Parse (argc, argv);
 
diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc
index dfc0a8807..b7cf3c21e 100644
--- a/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc
+++ b/src/spectrum/examples/adhoc-aloha-ideal-phy-matrix-propagation-loss-model.cc
@@ -123,7 +123,7 @@ GlobalPathlossDatabase::Print ()
 
 int main (int argc, char** argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   double lossDb = 130;
   double txPowerW = 0.1; 
   uint64_t phyRate = 500000;
diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc
index 9e89f1e13..ffd4d6c7f 100644
--- a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc
+++ b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc
@@ -124,7 +124,7 @@ SetupPacketReceive (Ptr<Node> node)
 
 int main (int argc, char** argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "Print trace information if true", g_verbose);
   cmd.Parse (argc, argv);
 
diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc
index 839b13dce..4eabde8f3 100644
--- a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc
+++ b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc
@@ -119,7 +119,7 @@ SetupPacketReceive (Ptr<Node> node)
 
 int main (int argc, char** argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("verbose", "Print trace information if true", g_verbose);
   cmd.Parse (argc, argv);
 
diff --git a/src/spectrum/examples/tv-trans-example.cc b/src/spectrum/examples/tv-trans-example.cc
index f41f57ca4..2714f4401 100644
--- a/src/spectrum/examples/tv-trans-example.cc
+++ b/src/spectrum/examples/tv-trans-example.cc
@@ -41,7 +41,7 @@ using namespace ns3;
  */
 int main (int argc, char** argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   /* nodes and positions */
diff --git a/src/spectrum/examples/tv-trans-regional-example.cc b/src/spectrum/examples/tv-trans-regional-example.cc
index 2b8fe812f..158ea8ebd 100644
--- a/src/spectrum/examples/tv-trans-regional-example.cc
+++ b/src/spectrum/examples/tv-trans-regional-example.cc
@@ -41,7 +41,7 @@ using namespace ns3;
  */
 int main (int argc, char** argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   /* random seed and run number; adjust these to change random draws */
diff --git a/src/stats/doc/statistics.rst b/src/stats/doc/statistics.rst
index 02a4ae163..c0b6a2baf 100644
--- a/src/stats/doc/statistics.rst
+++ b/src/stats/doc/statistics.rst
@@ -108,7 +108,7 @@ The first thing to do in implementing this experiment is developing the simulati
     string strategy ("wifi-default");
     string runID;
 
-    CommandLine cmd;
+    COMMANDLINE (cmd);
     cmd.AddValue("distance",   "Distance apart to place nodes (in meters).", distance);
     cmd.AddValue("format",     "Format to use for data output.",             format);
     cmd.AddValue("experiment", "Identifier for experiment.",                 experiment);
diff --git a/src/stats/examples/double-probe-example.cc b/src/stats/examples/double-probe-example.cc
index 19d29bb77..b2fd73cce 100644
--- a/src/stats/examples/double-probe-example.cc
+++ b/src/stats/examples/double-probe-example.cc
@@ -120,7 +120,7 @@ NotifyViaProbe (std::string context, double oldVal, double newVal)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   bool connected;
 
diff --git a/src/stats/examples/file-helper-example.cc b/src/stats/examples/file-helper-example.cc
index e4a89c7e4..5e902aa7d 100644
--- a/src/stats/examples/file-helper-example.cc
+++ b/src/stats/examples/file-helper-example.cc
@@ -99,7 +99,7 @@ Emitter::Count (void)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //
diff --git a/src/stats/examples/gnuplot-helper-example.cc b/src/stats/examples/gnuplot-helper-example.cc
index 4619864a7..cb55680b2 100644
--- a/src/stats/examples/gnuplot-helper-example.cc
+++ b/src/stats/examples/gnuplot-helper-example.cc
@@ -98,7 +98,7 @@ Emitter::Count (void)
 
 int main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //
diff --git a/src/stats/examples/time-probe-example.cc b/src/stats/examples/time-probe-example.cc
index e55eaa8fc..cfb16d89d 100644
--- a/src/stats/examples/time-probe-example.cc
+++ b/src/stats/examples/time-probe-example.cc
@@ -143,7 +143,7 @@ int main (int argc, char *argv[])
   double stopTime = 100.0;
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("stopTime", "Time (seconds) to terminate simulation", stopTime);
   cmd.AddValue ("verbose", "Whether to enable verbose output", verbose);
   cmd.Parse (argc, argv);
diff --git a/src/tap-bridge/examples/tap-csma-virtual-machine.cc b/src/tap-bridge/examples/tap-csma-virtual-machine.cc
index b1ea3cf3e..4b93966a7 100644
--- a/src/tap-bridge/examples/tap-csma-virtual-machine.cc
+++ b/src/tap-bridge/examples/tap-csma-virtual-machine.cc
@@ -73,7 +73,7 @@ NS_LOG_COMPONENT_DEFINE ("TapCsmaVirtualMachineExample");
 int 
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //
diff --git a/src/tap-bridge/examples/tap-csma.cc b/src/tap-bridge/examples/tap-csma.cc
index 81b2fb14a..2a824b314 100644
--- a/src/tap-bridge/examples/tap-csma.cc
+++ b/src/tap-bridge/examples/tap-csma.cc
@@ -75,7 +75,7 @@ main (int argc, char *argv[])
   std::string mode = "ConfigureLocal";
   std::string tapName = "thetap";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("mode", "Mode setting of TapBridge", mode);
   cmd.AddValue ("tapName", "Name of the OS tap device", tapName);
   cmd.Parse (argc, argv);
diff --git a/src/tap-bridge/examples/tap-wifi-dumbbell.cc b/src/tap-bridge/examples/tap-wifi-dumbbell.cc
index a406a6e05..12ac5b3d5 100644
--- a/src/tap-bridge/examples/tap-wifi-dumbbell.cc
+++ b/src/tap-bridge/examples/tap-wifi-dumbbell.cc
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
   std::string mode = "ConfigureLocal";
   std::string tapName = "thetap";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("mode", "Mode setting of TapBridge", mode);
   cmd.AddValue ("tapName", "Name of the OS tap device", tapName);
   cmd.Parse (argc, argv);
diff --git a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc
index d50e113d1..0cda3c9a0 100644
--- a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc
+++ b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc
@@ -82,7 +82,7 @@ NS_LOG_COMPONENT_DEFINE ("TapWifiVirtualMachineExample");
 int 
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   //
diff --git a/src/test/perf/perf-io.cc b/src/test/perf/perf-io.cc
index d15ddc23b..311b252f3 100644
--- a/src/test/perf/perf-io.cc
+++ b/src/test/perf/perf-io.cc
@@ -73,7 +73,7 @@ main (int argc, char *argv[])
   bool binmode = true;
  
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("n", "How many times to write (defaults to 100000", n);
   cmd.AddValue ("iter", "How many times to run the test looking for a min (defaults to 50)", iter);
   cmd.AddValue ("doStream", "Run the C++ I/O benchmark otherwise the C I/O ", doStream);
diff --git a/src/topology-read/examples/topology-example-sim.cc b/src/topology-read/examples/topology-example-sim.cc
index 0cfe798a1..d3e70d280 100644
--- a/src/topology-read/examples/topology-example-sim.cc
+++ b/src/topology-read/examples/topology-example-sim.cc
@@ -88,7 +88,7 @@ int main (int argc, char *argv[])
   std::string input ("src/topology-read/examples/Inet_small_toposample.txt");
 
   // Set up command line parameters used to control the experiment.
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("format", "Format to use for data input [Orbis|Inet|Rocketfuel].",
                 format);
   cmd.AddValue ("input", "Name of the input file.",
diff --git a/src/traffic-control/examples/adaptive-red-tests.cc b/src/traffic-control/examples/adaptive-red-tests.cc
index dddc20d60..fcf9ddfb0 100644
--- a/src/traffic-control/examples/adaptive-red-tests.cc
+++ b/src/traffic-control/examples/adaptive-red-tests.cc
@@ -202,7 +202,7 @@ main (int argc, char *argv[])
   aredTest = 1;
   // Will only save in the directory if enable opts below
   pathOut = "."; // Current directory
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   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);
diff --git a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc
index 9dfd4f336..19f4bba6f 100644
--- a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc
+++ b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc
@@ -238,7 +238,7 @@ int main (int argc, char *argv[])
   std::string fileNamePrefix = "codel-vs-pfifo-fast-asymmetric";
   bool logging = true;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("serverCmtsDelay", "Link delay between server and CMTS", serverCmtsDelay);
   cmd.AddValue ("cmtsRouterDelay", "Link delay between CMTS and rounter", cmtsRouterDelay);
   cmd.AddValue ("routerHostDelay", "Link delay between router and host", routerHostDelay);
diff --git a/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc b/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc
index 0a07c940a..6363b77e8 100644
--- a/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc
+++ b/src/traffic-control/examples/codel-vs-pfifo-basic-test.cc
@@ -95,7 +95,7 @@ int main (int argc, char *argv[])
   std::string cwndTrFileName = "cwndPfifoFast.tr";
   bool logging = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("bottleneckBandwidth", "Bottleneck bandwidth", bottleneckBandwidth);
   cmd.AddValue ("bottleneckDelay", "Bottleneck delay", bottleneckDelay);
   cmd.AddValue ("accessBandwidth", "Access link bandwidth", accessBandwidth);
diff --git a/src/traffic-control/examples/pfifo-vs-red.cc b/src/traffic-control/examples/pfifo-vs-red.cc
index 02f87d02f..47194f995 100644
--- a/src/traffic-control/examples/pfifo-vs-red.cc
+++ b/src/traffic-control/examples/pfifo-vs-red.cc
@@ -49,7 +49,7 @@ int main (int argc, char *argv[])
   std::string bottleNeckLinkBw = "1Mbps";
   std::string bottleNeckLinkDelay = "50ms";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nLeaf",     "Number of left and right side leaf nodes", nLeaf);
   cmd.AddValue ("maxPackets","Max Packets allowed in the device queue", maxPackets);
   cmd.AddValue ("queueDiscLimitPackets","Max Packets allowed in the queue disc", queueDiscLimitPackets);
diff --git a/src/traffic-control/examples/pie-example.cc b/src/traffic-control/examples/pie-example.cc
index 0e288e73d..066ff7484 100644
--- a/src/traffic-control/examples/pie-example.cc
+++ b/src/traffic-control/examples/pie-example.cc
@@ -159,7 +159,7 @@ main (int argc, char *argv[])
   // Configuration and command line parameter parsing
   // Will only save in the directory if enable opts below
   pathOut = "."; // Current directory
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   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);
diff --git a/src/traffic-control/examples/red-tests.cc b/src/traffic-control/examples/red-tests.cc
index 45bcc8e89..4c8571ab2 100644
--- a/src/traffic-control/examples/red-tests.cc
+++ b/src/traffic-control/examples/red-tests.cc
@@ -279,7 +279,7 @@ main (int argc, char *argv[])
   redTest = 1;
   // Will only save in the directory if enable opts below
   pathOut = "."; // Current directory
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   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);
diff --git a/src/traffic-control/examples/red-vs-ared.cc b/src/traffic-control/examples/red-vs-ared.cc
index f210f8e6d..a7e162c7b 100644
--- a/src/traffic-control/examples/red-vs-ared.cc
+++ b/src/traffic-control/examples/red-vs-ared.cc
@@ -48,7 +48,7 @@ int main (int argc, char *argv[])
   std::string bottleNeckLinkBw = "1Mbps";
   std::string bottleNeckLinkDelay = "50ms";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nLeaf",     "Number of left and right side leaf nodes", nLeaf);
   cmd.AddValue ("maxPackets","Max Packets allowed in the device queue", maxPackets);
   cmd.AddValue ("queueDiscLimitPackets","Max Packets allowed in the queue disc", queueDiscLimitPackets);
diff --git a/src/uan/examples/uan-6lowpan-example.cc b/src/uan/examples/uan-6lowpan-example.cc
index fe9b9718f..82ce9d99a 100644
--- a/src/uan/examples/uan-6lowpan-example.cc
+++ b/src/uan/examples/uan-6lowpan-example.cc
@@ -254,7 +254,7 @@ UanExperiment::Teardown ()
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   UanExperiment experiment;
diff --git a/src/uan/examples/uan-cw-example.cc b/src/uan/examples/uan-cw-example.cc
index 9f7192d1b..9a4454cd8 100644
--- a/src/uan/examples/uan-cw-example.cc
+++ b/src/uan/examples/uan-cw-example.cc
@@ -273,7 +273,7 @@ main (int argc, char **argv)
   std::string perModel = "ns3::UanPhyPerGenDefault";
   std::string sinrModel = "ns3::UanPhyCalcSinrDefault";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("NumNodes", "Number of transmitting nodes", exp.m_numNodes);
   cmd.AddValue ("Depth", "Depth of transmitting and sink nodes", exp.m_depth);
   cmd.AddValue ("RegionSize", "Size of boundary in meters", exp.m_boundary);
diff --git a/src/uan/examples/uan-ipv4-example.cc b/src/uan/examples/uan-ipv4-example.cc
index fa6052e7d..ffba2f0c6 100644
--- a/src/uan/examples/uan-ipv4-example.cc
+++ b/src/uan/examples/uan-ipv4-example.cc
@@ -246,7 +246,7 @@ UanExperiment::Teardown ()
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   UanExperiment experiment;
diff --git a/src/uan/examples/uan-ipv6-example.cc b/src/uan/examples/uan-ipv6-example.cc
index 3053a01d7..d65e45773 100644
--- a/src/uan/examples/uan-ipv6-example.cc
+++ b/src/uan/examples/uan-ipv6-example.cc
@@ -249,7 +249,7 @@ UanExperiment::Teardown ()
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   UanExperiment experiment;
diff --git a/src/uan/examples/uan-raw-example.cc b/src/uan/examples/uan-raw-example.cc
index 017ce31bb..61600de6f 100644
--- a/src/uan/examples/uan-raw-example.cc
+++ b/src/uan/examples/uan-raw-example.cc
@@ -241,7 +241,7 @@ UanExperiment::Teardown ()
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   UanExperiment experiment;
diff --git a/src/uan/examples/uan-rc-example.cc b/src/uan/examples/uan-rc-example.cc
index 1f73635ac..6d8a2116f 100644
--- a/src/uan/examples/uan-rc-example.cc
+++ b/src/uan/examples/uan-rc-example.cc
@@ -254,7 +254,7 @@ main (int argc, char *argv[])
   Experiment exp;
   bool quiet = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("TotalRate", "Total channel capacity", exp.m_totalRate);
   cmd.AddValue ("NumberRates", "Number of divided rates ( (NumberRates+1)%TotalRate should be 0)", exp.m_numRates);
   cmd.AddValue ("MaxRange", "Maximum range between gateway and acoustic node", exp.m_maxRange);
diff --git a/src/virtual-net-device/examples/virtual-net-device.cc b/src/virtual-net-device/examples/virtual-net-device.cc
index 7423e19d9..6dd856073 100644
--- a/src/virtual-net-device/examples/virtual-net-device.cc
+++ b/src/virtual-net-device/examples/virtual-net-device.cc
@@ -198,7 +198,7 @@ main (int argc, char *argv[])
 
   // Allow the user to override any of the defaults and the above
   // Config::SetDefault ()s at run-time, via command-line arguments
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
 
   NS_LOG_INFO ("Create nodes.");
diff --git a/src/wave/examples/vanet-routing-compare.cc b/src/wave/examples/vanet-routing-compare.cc
index 4399403e4..8cfcfa117 100644
--- a/src/wave/examples/vanet-routing-compare.cc
+++ b/src/wave/examples/vanet-routing-compare.cc
@@ -2005,7 +2005,7 @@ VanetRoutingExperiment::SetGlobalsFromConfig ()
 void
 VanetRoutingExperiment::CommandSetup (int argc, char **argv)
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   double txDist1 = 50.0;
   double txDist2 = 100.0;
   double txDist3 = 150.0;
diff --git a/src/wave/examples/wave-simple-80211p.cc b/src/wave/examples/wave-simple-80211p.cc
index 3eb71c942..820d22542 100644
--- a/src/wave/examples/wave-simple-80211p.cc
+++ b/src/wave/examples/wave-simple-80211p.cc
@@ -105,7 +105,7 @@ int main (int argc, char *argv[])
   double interval = 1.0; // seconds
   bool verbose = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
 
   cmd.AddValue ("phyMode", "Wifi Phy mode", phyMode);
   cmd.AddValue ("packetSize", "size of application packet sent", packetSize);
diff --git a/src/wave/examples/wave-simple-device.cc b/src/wave/examples/wave-simple-device.cc
index de0d1658f..f2215870e 100644
--- a/src/wave/examples/wave-simple-device.cc
+++ b/src/wave/examples/wave-simple-device.cc
@@ -278,7 +278,7 @@ WaveNetDeviceExample::SendWsaExample ()
 int
 main (int argc, char *argv[])
 {
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Parse (argc, argv);
   
   WaveNetDeviceExample example;
diff --git a/src/wifi/examples/wifi-manager-example.cc b/src/wifi/examples/wifi-manager-example.cc
index 3143d166c..00ff58589 100644
--- a/src/wifi/examples/wifi-manager-example.cc
+++ b/src/wifi/examples/wifi-manager-example.cc
@@ -172,7 +172,7 @@ int main (int argc, char *argv[])
   uint32_t maxSlrc = 7;
   uint32_t maxSsrc = 7;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("maxSsrc", "The maximum number of retransmission attempts for a RTS packet", maxSsrc);
   cmd.AddValue ("maxSlrc", "The maximum number of retransmission attempts for a Data packet", maxSlrc);
   cmd.AddValue ("rtsThreshold", "RTS threshold", rtsThreshold);
diff --git a/src/wifi/examples/wifi-phy-configuration.cc b/src/wifi/examples/wifi-phy-configuration.cc
index b02ae66ab..5472a560e 100644
--- a/src/wifi/examples/wifi-phy-configuration.cc
+++ b/src/wifi/examples/wifi-phy-configuration.cc
@@ -62,7 +62,7 @@ int main (int argc, char *argv[])
   uint32_t testCase = 0;
   bool printAttributes = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("testCase", "Test case", testCase);
   cmd.AddValue ("printAttributes", "If true, print out attributes", printAttributes);
   cmd.Parse (argc, argv);
diff --git a/src/wifi/examples/wifi-phy-test.cc b/src/wifi/examples/wifi-phy-test.cc
index 44d303133..825292786 100644
--- a/src/wifi/examples/wifi-phy-test.cc
+++ b/src/wifi/examples/wifi-phy-test.cc
@@ -323,7 +323,7 @@ static void PrintPsr (int argc, char *argv[])
   PsrExperiment experiment;
   struct PsrExperiment::Input input;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("Distance", "The distance between two phys", input.distance);
   cmd.AddValue ("PacketSize", "The size of each packet sent", input.packetSize);
   cmd.AddValue ("TxMode", "The mode to use to send each packet", input.txMode);
@@ -350,7 +350,7 @@ double CalcPsr (struct PsrExperiment::Output output, struct PsrExperiment::Input
 static void PrintPsrVsDistance (int argc, char *argv[])
 {
   struct PsrExperiment::Input input;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("TxPowerLevel", "The power level index to use to send each packet", input.txPowerLevel);
   cmd.AddValue ("TxMode", "The mode to use to send each packet", input.txMode);
   cmd.AddValue ("NPackets", "The number of packets to send", input.nPackets);
@@ -403,7 +403,7 @@ static void PrintSizeVsRange (int argc, char *argv[])
 {
   double targetPsr = 0.05;
   struct PsrExperiment::Input input;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("TxPowerLevel", "The power level index to use to send each packet", input.txPowerLevel);
   cmd.AddValue ("TxMode", "The mode to use to send each packet", input.txMode);
   cmd.AddValue ("NPackets", "The number of packets to send", input.nPackets);
@@ -440,7 +440,7 @@ static void PrintPsrVsCollisionInterval (int argc, char *argv[])
 {
   CollisionExperiment::Input input;
   input.nPackets = 100;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("NPackets", "The number of packets to send for each transmitter", input.nPackets);
   cmd.AddValue ("xA", "the position of transmitter A", input.xA);
   cmd.AddValue ("xB", "the position of transmitter B", input.xB);
diff --git a/src/wifi/examples/wifi-test-interference-helper.cc b/src/wifi/examples/wifi-test-interference-helper.cc
index eb29b1e44..38d6af4fb 100644
--- a/src/wifi/examples/wifi-test-interference-helper.cc
+++ b/src/wifi/examples/wifi-test-interference-helper.cc
@@ -307,7 +307,7 @@ int main (int argc, char *argv[])
   std::string str_preamble = "WIFI_PREAMBLE_LONG";
   uint64_t delay = 0; //microseconds
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("delay", "Delay in microseconds between frame transmission from sender A and frame transmission from sender B", delay);
   cmd.AddValue ("xA", "The position of transmitter A (< 0)", input.xA);
   cmd.AddValue ("xB", "The position of transmitter B (> 0)", input.xB);
diff --git a/src/wifi/examples/wifi-trans-example.cc b/src/wifi/examples/wifi-trans-example.cc
index 1af823ffe..685dc6948 100644
--- a/src/wifi/examples/wifi-trans-example.cc
+++ b/src/wifi/examples/wifi-trans-example.cc
@@ -57,7 +57,7 @@ int main (int argc, char** argv)
   int bw = 20;
   double pow = 23; //dBm
   bool verbose = false;
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("standard",
                 "OFDM-based Wi-Fi standard [11a, 11_10MHZ, 11_5MHZ, 11n_2_4GHZ, 11n_5GHZ, 11ac, 11ax_2_4GHZ, 11ax_5GHZ]",
                 standard);
diff --git a/src/wimax/examples/wimax-ipv4.cc b/src/wimax/examples/wimax-ipv4.cc
index 66754b25b..b42838f40 100644
--- a/src/wimax/examples/wimax-ipv4.cc
+++ b/src/wimax/examples/wimax-ipv4.cc
@@ -74,7 +74,7 @@ int main (int argc, char *argv[])
   LogComponentEnable ("UdpServer", LOG_LEVEL_INFO);
 
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nbSS", "number of subscriber station to create", nbSS);
   cmd.AddValue ("scheduler", "type of scheduler to use with the network devices", schedType);
   cmd.AddValue ("duration", "duration of the simulation in seconds", duration);
diff --git a/src/wimax/examples/wimax-multicast.cc b/src/wimax/examples/wimax-multicast.cc
index 18a224f77..99c9f4ec9 100644
--- a/src/wimax/examples/wimax-multicast.cc
+++ b/src/wimax/examples/wimax-multicast.cc
@@ -100,7 +100,7 @@ int main (int argc, char *argv[])
   int nbSS = 10, duration = 7, schedType = 0;
   WimaxHelper::SchedulerType scheduler = WimaxHelper::SCHED_TYPE_SIMPLE;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("nbSS", "number of subscriber station to create", nbSS);
   cmd.AddValue ("scheduler", "type of scheduler to use with the netdevices", schedType);
   cmd.AddValue ("duration", "duration of the simulation in seconds", duration);
diff --git a/src/wimax/examples/wimax-simple.cc b/src/wimax/examples/wimax-simple.cc
index 7f05be300..06a5b61ac 100644
--- a/src/wimax/examples/wimax-simple.cc
+++ b/src/wimax/examples/wimax-simple.cc
@@ -65,7 +65,7 @@ int main (int argc, char *argv[])
   int duration = 7, schedType = 0;
   WimaxHelper::SchedulerType scheduler = WimaxHelper::SCHED_TYPE_SIMPLE;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.AddValue ("scheduler", "type of scheduler to use with the network devices", schedType);
   cmd.AddValue ("duration", "duration of the simulation in seconds", duration);
   cmd.AddValue ("verbose", "turn on all WimaxNetDevice log components", verbose);
diff --git a/utils/bench-packets.cc b/utils/bench-packets.cc
index 02006e95d..3ed06b584 100644
--- a/utils/bench-packets.cc
+++ b/utils/bench-packets.cc
@@ -363,7 +363,7 @@ int main (int argc, char *argv[])
   uint32_t minIterations = 1;
   bool enablePrinting = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Usage ("Benchmark Packet class");
   cmd.AddValue ("n", "number of iterations", n);
   cmd.AddValue ("min-iterations", "number of subiterations to minimize iteration time over", minIterations);
diff --git a/utils/bench-simulator.cc b/utils/bench-simulator.cc
index 07ca73c45..a366dbdcc 100644
--- a/utils/bench-simulator.cc
+++ b/utils/bench-simulator.cc
@@ -213,7 +213,7 @@ int main (int argc, char *argv[])
   uint32_t runs  =       1;
   std::string filename = "";
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Usage ("Benchmark the simulator scheduler.\n"
              "\n"
              "Event intervals are taken from one of:\n"
diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc
index 26ded86f3..3c6f058d1 100644
--- a/utils/print-introspected-doxygen.cc
+++ b/utils/print-introspected-doxygen.cc
@@ -1107,6 +1107,7 @@ PrintAllGlobals (std::ostream & os)
   os << commentStart << page << "GlobalValueList All GlobalValues\n"
      << std::endl;
   os << "This is a list of all" << reference << "ns3::GlobalValue instances.\n"
+     << "See ns3::GlobalValue for how to set these."
      << std::endl;
   
   os << listStart << std::endl;
@@ -1582,7 +1583,7 @@ int main (int argc, char *argv[])
   NS_LOG_FUNCTION_NOARGS ();
   bool outputText = false;
 
-  CommandLine cmd;
+  COMMANDLINE (cmd);
   cmd.Usage ("Generate documentation for all ns-3 registered types, "
 	     "trace sources, attributes and global variables.");
   cmd.AddValue ("output-text", "format output as plain text", outputText);