Rename level[1-6]() to l[1-6]()

23 files changed, 107 insertions, 112 deletions

diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx
index fbc1a69..dab12c9 100644
--- a/build2/algorithm.cxx
+++ b/build2/algorithm.cxx
@@ -321,7 +321,7 @@ namespace build2
     if (!d.sub (out_root) || d == out_root)
       return;
 
-    level6 ([&]{trace << "for " << t;});
+    l6 ([&]{trace << "for " << t;});
 
     fsdir& dt (search<fsdir> (d, string (), nullptr, &s));
     match (a, dt);
diff --git a/build2/b.cxx b/build2/b.cxx
index 3512081..999fd44 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -274,7 +274,7 @@ main (int argc, char* argv[])
       fail << "unable to parse buildspec '" << args << "'";
     }
 
-    level5 ([&]{trace << "buildspec: " << bspec;});
+    l5 ([&]{trace << "buildspec: " << bspec;});
 
     if (bspec.empty ())
       bspec.push_back (metaopspec ()); // Default meta-operation.
@@ -321,8 +321,8 @@ main (int argc, char* argv[])
           if (mif->meta_operation_post != nullptr)
             mif->meta_operation_post ();
 
-          level5 ([&]{trace << "end meta-operation batch " << mif->name
-                            << ", id " << static_cast<uint16_t> (mid);});
+          l5 ([&]{trace << "end meta-operation batch " << mif->name << ", id "
+                        << static_cast<uint16_t> (mid);});
 
           mid = 0;
           lifted = false;
@@ -609,10 +609,8 @@ main (int argc, char* argv[])
                     if (mif->meta_operation_post != nullptr)
                       mif->meta_operation_post ();
 
-                    level5 ([&]{trace << "end meta-operation batch "
-                                      << mif->name << ", id "
-                                      << static_cast<uint16_t> (mid);});
-
+                    l5 ([&]{trace << "end meta-operation batch " << mif->name
+                                  << ", id " << static_cast<uint16_t> (mid);});
                     mid = 0;
                   }
 
@@ -675,8 +673,8 @@ main (int argc, char* argv[])
                 fail (l) << "target " << tn << " does not support meta-"
                          << "operation " << meta_operation_table[m];
 
-              level5 ([&]{trace << "start meta-operation batch " << mif->name
-                                << ", id " << static_cast<uint16_t> (mid);});
+              l5 ([&]{trace << "start meta-operation batch " << mif->name
+                            << ", id " << static_cast<uint16_t> (mid);});
 
               if (mif->meta_operation_pre != nullptr)
                 mif->meta_operation_pre ();
@@ -721,8 +719,8 @@ main (int argc, char* argv[])
 
               oif = lookup (o);
 
-              level5 ([&]{trace << "start operation batch " << oif->name
-                                << ", id " << static_cast<uint16_t> (o);});
+              l5 ([&]{trace << "start operation batch " << oif->name
+                            << ", id " << static_cast<uint16_t> (o);});
 
               // Allow the meta-operation to translate the operation.
               //
@@ -734,8 +732,8 @@ main (int argc, char* argv[])
               if (o != oid)
               {
                 oif = lookup (oid);
-                level5 ([&]{trace << "operation translated to " << oif->name
-                                  << ", id " << static_cast<uint16_t> (oid);});
+                l5 ([&]{trace << "operation translated to " << oif->name
+                              << ", id " << static_cast<uint16_t> (oid);});
               }
 
               // Handle pre/post operations.
@@ -834,8 +832,8 @@ main (int argc, char* argv[])
 
         if (pre_oid != 0)
         {
-          level5 ([&]{trace << "start pre-operation batch " << pre_oif->name
-                            << ", id " << static_cast<uint16_t> (pre_oid);});
+          l5 ([&]{trace << "start pre-operation batch " << pre_oif->name
+                        << ", id " << static_cast<uint16_t> (pre_oid);});
 
           if (mif->operation_pre != nullptr)
             mif->operation_pre (pre_oid); // Cannot be translated.
@@ -853,8 +851,8 @@ main (int argc, char* argv[])
           if (mif->operation_post != nullptr)
             mif->operation_post (pre_oid);
 
-          level5 ([&]{trace << "end pre-operation batch " << pre_oif->name
-                            << ", id " << static_cast<uint16_t> (pre_oid);});
+          l5 ([&]{trace << "end pre-operation batch " << pre_oif->name
+                        << ", id " << static_cast<uint16_t> (pre_oid);});
         }
 
         current_inner_oif = oif;
@@ -869,8 +867,8 @@ main (int argc, char* argv[])
 
         if (post_oid != 0)
         {
-          level5 ([&]{trace << "start post-operation batch " << post_oif->name
-                            << ", id " << static_cast<uint16_t> (post_oid);});
+          l5 ([&]{trace << "start post-operation batch " << post_oif->name
+                        << ", id " << static_cast<uint16_t> (post_oid);});
 
           if (mif->operation_pre != nullptr)
             mif->operation_pre (post_oid); // Cannot be translated.
@@ -888,22 +886,22 @@ main (int argc, char* argv[])
           if (mif->operation_post != nullptr)
             mif->operation_post (post_oid);
 
-          level5 ([&]{trace << "end post-operation batch " << post_oif->name
-                            << ", id " << static_cast<uint16_t> (post_oid);});
+          l5 ([&]{trace << "end post-operation batch " << post_oif->name
+                        << ", id " << static_cast<uint16_t> (post_oid);});
         }
 
         if (mif->operation_post != nullptr)
           mif->operation_post (oid);
 
-        level5 ([&]{trace << "end operation batch " << oif->name
-                          << ", id " << static_cast<uint16_t> (oid);});
+        l5 ([&]{trace << "end operation batch " << oif->name
+                      << ", id " << static_cast<uint16_t> (oid);});
       }
 
       if (mif->meta_operation_post != nullptr)
         mif->meta_operation_post ();
 
-      level5 ([&]{trace << "end meta-operation batch " << mif->name
-                        << ", id " << static_cast<uint16_t> (mid);});
+      l5 ([&]{trace << "end meta-operation batch " << mif->name
+                    << ", id " << static_cast<uint16_t> (mid);});
     }
   }
   catch (const failed&)
diff --git a/build2/bin/module.cxx b/build2/bin/module.cxx
index 397ab74..c691a23 100644
--- a/build2/bin/module.cxx
+++ b/build2/bin/module.cxx
@@ -38,7 +38,7 @@ namespace build2
               bool)
     {
       tracer trace ("bin::init");
-      level5 ([&]{trace << "for " << b.out_path ();});
+      l5 ([&]{trace << "for " << b.out_path ();});
 
       // Enter module variables.
       //
diff --git a/build2/cli/module.cxx b/build2/cli/module.cxx
index e4f2716..018947a 100644
--- a/build2/cli/module.cxx
+++ b/build2/cli/module.cxx
@@ -37,7 +37,7 @@ namespace build2
               bool optional)
     {
       tracer trace ("cli::init");
-      level5 ([&]{trace << "for " << base.out_path ();});
+      l5 ([&]{trace << "for " << base.out_path ();});
 
       // Make sure the cxx module has been loaded since we need its
       // targets types (?xx{}). Note that we don't try to load it
diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx
index b584ccc..82217c7 100644
--- a/build2/cli/rule.cxx
+++ b/build2/cli/rule.cxx
@@ -66,8 +66,8 @@ namespace build2
             //
             if (!match_stem (t.name, p.name ()))
             {
-              level4 ([&]{trace << ".cli file stem '" << p.name () << "' "
-                                << "doesn't match target " << t;});
+              l4 ([&]{trace << ".cli file stem '" << p.name () << "' "
+                            << "doesn't match target " << t;});
               return r;
             }
 
@@ -78,7 +78,7 @@ namespace build2
 
         if (!r)
         {
-          level4 ([&]{trace << "no .cli source file for target " << t;});
+          l4 ([&]{trace << "no .cli source file for target " << t;});
           return r;
         }
 
@@ -140,8 +140,8 @@ namespace build2
                 g->prerequisites.emplace_back (p.as_prerequisite (trace));
               }
               else
-                level4 ([&]{trace << ".cli file stem '" << p.name () << "' "
-                                  << "doesn't match target " << t;});
+                l4 ([&]{trace << ".cli file stem '" << p.name () << "' "
+                              << "doesn't match target " << t;});
               break;
             }
           }
@@ -158,8 +158,8 @@ namespace build2
           //
           if (t.is_a<cxx::ixx> () && g->i == nullptr)
           {
-            level4 ([&]{trace << "generation of inline file " << t
-                              << " is disabled with --suppress-inline";});
+            l4 ([&]{trace << "generation of inline file " << t
+                          << " is disabled with --suppress-inline";});
             g = nullptr;
           }
         }
diff --git a/build2/config/module.cxx b/build2/config/module.cxx
index 11b7aa1..6d2bd70 100644
--- a/build2/config/module.cxx
+++ b/build2/config/module.cxx
@@ -30,7 +30,7 @@ namespace build2
       tracer trace ("config::boot");
 
       const dir_path& out_root (root.out_path ());
-      level5 ([&]{trace << "for " << out_root;});
+      l5 ([&]{trace << "for " << out_root;});
 
       // Register meta-operations.
       //
@@ -66,7 +66,7 @@ namespace build2
         return true;
       }
 
-      level5 ([&]{trace << "for " << root.out_path ();});
+      l5 ([&]{trace << "for " << root.out_path ();});
 
       // Register alias and fallback rule for the configure meta-operation.
       //
diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx
index f450f21..6199f8b 100644
--- a/build2/config/operation.cxx
+++ b/build2/config/operation.cxx
@@ -170,7 +170,7 @@ namespace build2
       //
       if (a.operation () == default_id)
       {
-        level5 ([&]{trace << "completely configuring " << out_root;});
+        l5 ([&]{trace << "completely configuring " << out_root;});
 
         // Save src-root.build unless out_root is the same as src.
         //
@@ -282,7 +282,7 @@ namespace build2
                     const location&)
     {
       tracer trace ("disfigure_load");
-      level6 ([&]{trace << "skipping " << bf;});
+      l6 ([&]{trace << "skipping " << bf;});
     }
 
     static void
@@ -292,7 +292,7 @@ namespace build2
                       action_targets& ts)
     {
       tracer trace ("disfigure_search");
-      level6 ([&]{trace << "collecting " << root.out_path ();});
+      l6 ([&]{trace << "collecting " << root.out_path ();});
       ts.push_back (&root);
     }
 
@@ -364,7 +364,7 @@ namespace build2
       //
       if (a.operation () == default_id)
       {
-        level5 ([&]{trace << "completely disfiguring " << out_root;});
+        l5 ([&]{trace << "completely disfiguring " << out_root;});
 
         m = rmfile (out_root / config_file) || m;
 
@@ -433,7 +433,7 @@ namespace build2
       // Reset the dependency state since anything that could have been
       // loaded earlier using a previous configuration is now invalid.
       //
-      level6 ([&]{trace << "resetting dependency state";});
+      l6 ([&]{trace << "resetting dependency state";});
       reset ();
     }
 
diff --git a/build2/cxx/compile.cxx b/build2/cxx/compile.cxx
index 3223fb2..89c5fc4 100644
--- a/build2/cxx/compile.cxx
+++ b/build2/cxx/compile.cxx
@@ -55,7 +55,7 @@ namespace build2
           return p;
       }
 
-      level4 ([&]{trace << "no c++ source file for target " << t;});
+      l4 ([&]{trace << "no c++ source file for target " << t;});
       return nullptr;
     }
 
@@ -152,7 +152,7 @@ namespace build2
           dd.write ("cxx.compile 1");
 
           if (dl != nullptr)
-            level4 ([&]{trace << "rule mismatch forcing update of " << t;});
+            l4 ([&]{trace << "rule mismatch forcing update of " << t;});
         }
 
         // Then the compiler checksum.
@@ -166,7 +166,7 @@ namespace build2
             dd.write (csum.string ());
 
             if (dl != nullptr)
-              level4 ([&]{trace << "compiler mismatch forcing update of " << t;});
+              l4 ([&]{trace << "compiler mismatch forcing update of " << t;});
           }
         }
 
@@ -204,7 +204,7 @@ namespace build2
             dd.write (csum.string ());
 
             if (dl != nullptr)
-              level4 ([&]{trace << "options mismatch forcing update of " << t;});
+              l4 ([&]{trace << "options mismatch forcing update of " << t;});
           }
         }
 
@@ -216,7 +216,7 @@ namespace build2
           dd.write (st.path ());
 
           if (dl != nullptr)
-            level4 ([&]{trace << "source file mismatch forcing update of " << t;});
+            l4 ([&]{trace << "source file mismatch forcing update of " << t;});
         }
 
         // If any of the above checks resulted in a mismatch (different
@@ -317,7 +317,7 @@ namespace build2
           else
             continue;
 
-          level6 ([&]{trace << "-I '" << d << "'";});
+          l6 ([&]{trace << "-I '" << d << "'";});
 
           // If we are relative or not inside our project root, then
           // ignore.
@@ -359,7 +359,7 @@ namespace build2
           }
           else
           {
-            level6 ([&]{trace << "'" << p << "' = '" << d << "'";});
+            l6 ([&]{trace << "'" << p << "' = '" << d << "'";});
             m.emplace (move (p), move (d));
           }
         }
@@ -455,7 +455,7 @@ namespace build2
     {
       tracer trace ("cxx::compile::inject_prerequisites");
 
-      level6 ([&]{trace << "target: " << t;});
+      l6 ([&]{trace << "target: " << t;});
 
       // If things go wrong (and they often do in this area), give the user a
       // bit extra context.
@@ -586,7 +586,7 @@ namespace build2
 
           if (ns != os && ns != target_state::unchanged)
           {
-            level6 ([&]{trace << "updated " << pt;});
+            l6 ([&]{trace << "updated " << pt;});
             return true;
           }
         }
@@ -618,7 +618,7 @@ namespace build2
           // This is probably as often an error as an auto-generated file, so
           // trace at level 4.
           //
-          level4 ([&]{trace << "non-existent header '" << f << "'";});
+          l4 ([&]{trace << "non-existent header '" << f << "'";});
 
           // If we already did this and build_prefix_map() returned empty,
           // then we would have failed below.
@@ -665,7 +665,7 @@ namespace build2
           f.realize ();
         }
 
-        level6 ([&]{trace << "injecting " << f;});
+        l6 ([&]{trace << "injecting " << f;});
 
         // Verify/add it to the dependency database.
         //
@@ -796,7 +796,7 @@ namespace build2
             //
             if (restart)
             {
-              level6 ([&]{trace << "restarting";});
+              l6 ([&]{trace << "restarting";});
               dd.touch ();
               break;
             }
@@ -873,7 +873,7 @@ namespace build2
 
                 if (restart)
                 {
-                  level6 ([&]{trace << "restarting";});
+                  l6 ([&]{trace << "restarting";});
                   break;
                 }
               }
diff --git a/build2/cxx/link.cxx b/build2/cxx/link.cxx
index 3b5b857..9abcd73 100644
--- a/build2/cxx/link.cxx
+++ b/build2/cxx/link.cxx
@@ -429,7 +429,7 @@ namespace build2
       //
       if (seen_c && !seen_cxx && hint < "cxx")
       {
-        level4 ([&]{trace << "c prerequisite(s) without c++ or hint";});
+        l4 ([&]{trace << "c prerequisite(s) without c++ or hint";});
         return nullptr;
       }
 
diff --git a/build2/cxx/module.cxx b/build2/cxx/module.cxx
index f615129..35566d5 100644
--- a/build2/cxx/module.cxx
+++ b/build2/cxx/module.cxx
@@ -38,7 +38,7 @@ namespace build2
               bool)
     {
       tracer trace ("cxx::init");
-      level5 ([&]{trace << "for " << b.out_path ();});
+      l5 ([&]{trace << "for " << b.out_path ();});
 
       // Initialize the bin module. Only do this if it hasn't already
       // been loaded so that we don't overwrite user's bin.* settings.
@@ -286,7 +286,7 @@ namespace build2
         if (m.empty ())
           fail << "unable to determine '" << args[0] << "' compiler target";
 
-        level4 ([&]{trace << "compiler targets " << m;});
+        l4 ([&]{trace << "compiler targets " << m;});
 
         try
         {
diff --git a/build2/diagnostics b/build2/diagnostics
index 5ad6809..ffb24ff 100644
--- a/build2/diagnostics
+++ b/build2/diagnostics
@@ -62,12 +62,12 @@ namespace build2
   //
   extern uint16_t verb;
 
-  template <typename F> inline void level1 (const F& f) {if (verb >= 1) f ();}
-  template <typename F> inline void level2 (const F& f) {if (verb >= 2) f ();}
-  template <typename F> inline void level3 (const F& f) {if (verb >= 3) f ();}
-  template <typename F> inline void level4 (const F& f) {if (verb >= 4) f ();}
-  template <typename F> inline void level5 (const F& f) {if (verb >= 5) f ();}
-  template <typename F> inline void level6 (const F& f) {if (verb >= 6) f ();}
+  template <typename F> inline void l1 (const F& f) {if (verb >= 1) f ();}
+  template <typename F> inline void l2 (const F& f) {if (verb >= 2) f ();}
+  template <typename F> inline void l3 (const F& f) {if (verb >= 3) f ();}
+  template <typename F> inline void l4 (const F& f) {if (verb >= 4) f ();}
+  template <typename F> inline void l5 (const F& f) {if (verb >= 5) f ();}
+  template <typename F> inline void l6 (const F& f) {if (verb >= 6) f ();}
 
   // Stream verbosity level. It is determined by the diagnostic type (e.g.,
   // trace always has maximum verbosity) as well as the program verbosity. It
diff --git a/build2/dist/module.cxx b/build2/dist/module.cxx
index c7c3a23..a205a72 100644
--- a/build2/dist/module.cxx
+++ b/build2/dist/module.cxx
@@ -27,7 +27,7 @@ namespace build2
     {
       tracer trace ("dist::boot");
 
-      level5 ([&]{trace << "for " << r.out_path ();});
+      l5 ([&]{trace << "for " << r.out_path ();});
 
       // Register meta-operation.
       //
@@ -73,7 +73,7 @@ namespace build2
       }
 
       const dir_path& out_root (r.out_path ());
-      level5 ([&]{trace << "for " << out_root;});
+      l5 ([&]{trace << "for " << out_root;});
 
       // Register our wildcard rule. Do it explicitly for the alias
       // to prevent something like insert<target>(dist_id, test_id)
diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx
index fba0ab5..4105110 100644
--- a/build2/dist/operation.cxx
+++ b/build2/dist/operation.cxx
@@ -140,7 +140,7 @@ namespace build2
           if (rs != t.base_scope ().root_scope ())
             fail << "out of project target " << t;
 
-          level5 ([&]{trace << diag_doing (a, t);});
+          l5 ([&]{trace << diag_doing (a, t);});
 
           match (a, t);
         }
@@ -213,7 +213,7 @@ namespace build2
           auto l ((*ft)[dist_var]);
 
           if (l && !as<bool> (*l))
-            level5 ([&]{trace << "excluding " << *ft;});
+            l5 ([&]{trace << "excluding " << *ft;});
           else
             files.push_back (ft);
 
@@ -228,7 +228,7 @@ namespace build2
 
           if (l && as<bool> (*l))
           {
-            level5 ([&]{trace << "including " << *ft;});
+            l5 ([&]{trace << "including " << *ft;});
             files.push_back (ft);
           }
 
diff --git a/build2/file.cxx b/build2/file.cxx
index 0184ece..a49926b 100644
--- a/build2/file.cxx
+++ b/build2/file.cxx
@@ -86,7 +86,7 @@ namespace build2
 
       ifs.exceptions (ifstream::failbit | ifstream::badbit);
 
-      level5 ([&]{trace << "sourcing " << bf;});
+      l5 ([&]{trace << "sourcing " << bf;});
 
       parser p (boot);
       p.parse_buildfile (ifs, bf, root, base);
@@ -110,7 +110,7 @@ namespace build2
 
     if (!once.buildfiles.insert (bf).second)
     {
-      level5 ([&]{trace << "skipping already sourced " << bf;});
+      l5 ([&]{trace << "skipping already sourced " << bf;});
       return;
     }
 
@@ -331,8 +331,8 @@ namespace build2
       {
         src_root_v = extract_variable (f, "src_root");
         src_root = &as<dir_path> (src_root_v);
-        level5 ([&]{trace << "extracted src_root " << *src_root << " for "
-                          << out_root;});
+        l5 ([&]{trace << "extracted src_root " << *src_root << " for "
+                      << out_root;});
       }
     }
 
@@ -342,8 +342,8 @@ namespace build2
       name = move (as<string> (v));
     }
 
-    level5 ([&]{trace << "extracted project name '" << name << "' for "
-                      << *src_root;});
+    l5 ([&]{trace << "extracted project name '" << name << "' for "
+                  << *src_root;});
     return name;
   }
 
@@ -387,7 +387,7 @@ namespace build2
       // Calculate relative subdirectory for this subproject.
       //
       dir_path dir (sd.leaf (root));
-      level5 ([&]{trace << "subproject " << sd << " as " << dir;});
+      l5 ([&]{trace << "subproject " << sd << " as " << dir;});
 
       // Load its name. Note that here we don't use fallback src_root
       // since this function is used to scan both out_root and src_root.
@@ -419,7 +419,7 @@ namespace build2
             info << "first alternative: " << dir1 <<
             info << "second alternative: " << dir;
 
-        level6 ([&]{trace << "skipping duplicate";});
+        l6 ([&]{trace << "skipping duplicate";});
       }
     }
   }
@@ -446,7 +446,7 @@ namespace build2
       if (root.buildfiles.insert (bf).second)
         source (bf, root, root, true);
       else
-        level5 ([&]{trace << "skipping already sourced " << bf;});
+        l5 ([&]{trace << "skipping already sourced " << bf;});
 
       r = true;
     }
@@ -500,7 +500,7 @@ namespace build2
         {
           // Otherwise, use the outer root as our amalgamation.
           //
-          level5 ([&]{trace << out_root << " amalgamated as " << rd;});
+          l5 ([&]{trace << out_root << " amalgamated as " << rd;});
           v = move (rd);
         }
       }
@@ -516,7 +516,7 @@ namespace build2
         if (!ad.empty ())
         {
           dir_path rd (ad.relative (out_root));
-          level5 ([&]{trace << out_root << " amalgamated as " << rd;});
+          l5 ([&]{trace << out_root << " amalgamated as " << rd;});
           v = move (rd);
         }
       }
@@ -849,7 +849,7 @@ namespace build2
         // a stab at it.
         //
         target.proj = &project;
-        level5 ([&]{trace << "postponing " << target;});
+        l5 ([&]{trace << "postponing " << target;});
         return names {move (target)};
       }
     }
@@ -952,7 +952,7 @@ namespace build2
 
       ifs.exceptions (ifstream::failbit | ifstream::badbit);
 
-      level5 ([&]{trace << "importing " << es;});
+      l5 ([&]{trace << "importing " << es;});
 
       // @@ Should we verify these are all unqualified names? Or maybe
       // there is a use-case for the export stub to return a qualified
diff --git a/build2/install/module.cxx b/build2/install/module.cxx
index 03daef1..754fcb5 100644
--- a/build2/install/module.cxx
+++ b/build2/install/module.cxx
@@ -105,7 +105,7 @@ namespace build2
     {
       tracer trace ("install::boot");
 
-      level5 ([&]{trace << "for " << r.out_path ();});
+      l5 ([&]{trace << "for " << r.out_path ();});
 
       // Register the install operation.
       //
@@ -129,7 +129,7 @@ namespace build2
       }
 
       const dir_path& out_root (r.out_path ());
-      level5 ([&]{trace << "for " << out_root;});
+      l5 ([&]{trace << "for " << out_root;});
 
       // Enter module variables.
       //
diff --git a/build2/install/rule.cxx b/build2/install/rule.cxx
index c570a41..f4fe164 100644
--- a/build2/install/rule.cxx
+++ b/build2/install/rule.cxx
@@ -67,7 +67,7 @@ namespace build2
 
         if (l && as<dir_path> (*l).string () == "false")
         {
-          level5 ([&]{trace << "ignoring " << pt;});
+          l5 ([&]{trace << "ignoring " << pt;});
           continue;
         }
 
diff --git a/build2/operation.cxx b/build2/operation.cxx
index 77350e8..ef620ba 100644
--- a/build2/operation.cxx
+++ b/build2/operation.cxx
@@ -92,7 +92,7 @@ namespace build2
     for (void* vt: ts)
     {
       target& t (*static_cast<target*> (vt));
-      level5 ([&]{trace << "matching " << t;});
+      l5 ([&]{trace << "matching " << t;});
       match (a, t);
     }
 
@@ -115,7 +115,7 @@ namespace build2
       {
         target& t (*static_cast<target*> (v));
 
-        level5 ([&]{trace << diag_doing (a, t);});
+        l5 ([&]{trace << diag_doing (a, t);});
 
         switch (execute (a, t))
         {
diff --git a/build2/parser.cxx b/build2/parser.cxx
index 98ca30d..d729a4c 100644
--- a/build2/parser.cxx
+++ b/build2/parser.cxx
@@ -529,7 +529,7 @@ namespace build2
 
         ifs.exceptions (ifstream::failbit | ifstream::badbit);
 
-        level5 ([&]{trace (t) << "entering " << p;});
+        l5 ([&]{trace (t) << "entering " << p;});
 
         enter_buildfile (p);
 
@@ -548,7 +548,7 @@ namespace build2
         if (tt != type::eos)
           fail (t) << "unexpected " << t;
 
-        level5 ([&]{trace (t) << "leaving " << p;});
+        l5 ([&]{trace (t) << "leaving " << p;});
 
         lexer_ = ol;
         path_ = op;
@@ -604,7 +604,7 @@ namespace build2
           p /= path ("buildfile");
       }
 
-      level6 ([&]{trace (l) << "relative path " << p;});
+      l6 ([&]{trace (l) << "relative path " << p;});
 
       // Determine new out_base.
       //
@@ -646,11 +646,11 @@ namespace build2
       if (p.relative ())
         p = scope_->src_path () / p.leaf ();
 
-      level6 ([&]{trace (l) << "absolute path " << p;});
+      l6 ([&]{trace (l) << "absolute path " << p;});
 
       if (!root_->buildfiles.insert (p).second) // Note: may be "new" root.
       {
-        level5 ([&]{trace (l) << "skipping already included " << p;});
+        l5 ([&]{trace (l) << "skipping already included " << p;});
         scope_ = ocs;
         root_ = ors;
         continue;
@@ -665,7 +665,7 @@ namespace build2
 
         ifs.exceptions (ifstream::failbit | ifstream::badbit);
 
-        level5 ([&]{trace (t) << "entering " << p;});
+        l5 ([&]{trace (t) << "entering " << p;});
 
         enter_buildfile (p);
 
@@ -689,7 +689,7 @@ namespace build2
 
         process_default_target (t);
 
-        level5 ([&]{trace (t) << "leaving " << p;});
+        l5 ([&]{trace (t) << "leaving " << p;});
 
         default_target_ = odt;
         lexer_ = ol;
@@ -2138,7 +2138,7 @@ namespace build2
     //
     if (rs != root_)
     {
-      level5 ([&]{trace << "switching to root scope " << rs->out_path ();});
+      l5 ([&]{trace << "switching to root scope " << rs->out_path ();});
       root_ = rs;
     }
 
@@ -2170,7 +2170,7 @@ namespace build2
 
     target& dt (*default_target_);
 
-    level5 ([&]{trace (t) << "creating current directory alias for " << dt;});
+    l5 ([&]{trace (t) << "creating current directory alias for " << dt;});
 
     target& ct (
       targets.insert (
diff --git a/build2/prerequisite.cxx b/build2/prerequisite.cxx
index 2eccd7e..e28d082 100644
--- a/build2/prerequisite.cxx
+++ b/build2/prerequisite.cxx
@@ -69,7 +69,7 @@ namespace build2
     //
     if (p.ext != ext)
     {
-      level5 ([&]{
+      l5 ([&]{
           diag_record r (trace);
           r << "assuming prerequisite " << p << " is the same as the "
             << "one with ";
diff --git a/build2/rule.cxx b/build2/rule.cxx
index c0a34f9..55a35b9 100644
--- a/build2/rule.cxx
+++ b/build2/rule.cxx
@@ -59,7 +59,7 @@ namespace build2
         if (ts != timestamp_nonexistent)
           return t;
 
-        level4 ([&]{trace << "no existing file for target " << t;});
+        l4 ([&]{trace << "no existing file for target " << t;});
         return nullptr;
       }
     default:
diff --git a/build2/search.cxx b/build2/search.cxx
index a661474..7e85dab 100644
--- a/build2/search.cxx
+++ b/build2/search.cxx
@@ -46,9 +46,7 @@ namespace build2
 
     target& t (**i);
 
-    level5 ([&]{trace << "existing target " << t << " for prerequisite "
-                      << pk;});
-
+    l5 ([&]{trace << "existing target " << t << " for prerequisite " << pk;});
     return &t;
   }
 
@@ -79,7 +77,7 @@ namespace build2
         // (of course, if the user specified the extension explicitly, we will
         // still do so).
         //
-        level4 ([&]{trace << "no existing file for prerequisite " << cpk;});
+        l4 ([&]{trace << "no existing file for prerequisite " << cpk;});
         return nullptr;
       }
     }
@@ -108,8 +106,8 @@ namespace build2
       if (mt == timestamp_nonexistent)
         continue;
 
-      level5 ([&]{trace << "found existing file " << f << " for prerequisite "
-                        << cpk;});
+      l5 ([&]{trace << "found existing file " << f << " for prerequisite "
+                    << cpk;});
 
       // Find or insert. Note: using our updated extension.
       //
@@ -119,8 +117,8 @@ namespace build2
       //
       file& t (dynamic_cast<file&> (r.first));
 
-      level5 ([&]{trace << (r.second ? "new" : "existing") << " target "
-                        << t << " for prerequisite " << cpk;});
+      l5 ([&]{trace << (r.second ? "new" : "existing") << " target " << t
+                    << " for prerequisite " << cpk;});
 
       if (t.path ().empty ())
         t.path (move (f));
@@ -129,7 +127,7 @@ namespace build2
       return &t;
     }
 
-    level4 ([&]{trace << "no existing file for prerequisite " << cpk;});
+    l4 ([&]{trace << "no existing file for prerequisite " << cpk;});
     return nullptr;
   }
 
@@ -163,8 +161,7 @@ namespace build2
 
     target& t (r.first);
 
-    level5 ([&]{trace << "new target " << t << " for prerequisite " << pk;});
-
+    l5 ([&]{trace << "new target " << t << " for prerequisite " << pk;});
     return t;
   }
 }
diff --git a/build2/target.cxx b/build2/target.cxx
index 0a416bb..9d2f7af 100644
--- a/build2/target.cxx
+++ b/build2/target.cxx
@@ -205,7 +205,7 @@ namespace build2
       const string* ext (k.ext);
       if (t.ext != ext)
       {
-        level5 ([&]{
+        l5 ([&]{
             diag_record r (trace);
             r << "assuming target " << t << " is the same as the one with ";
             if (ext == nullptr)
diff --git a/build2/test/module.cxx b/build2/test/module.cxx
index 217376d..c8c0fa7 100644
--- a/build2/test/module.cxx
+++ b/build2/test/module.cxx
@@ -26,7 +26,7 @@ namespace build2
     {
       tracer trace ("test::boot");
 
-      level5 ([&]{trace << "for " << root.out_path ();});
+      l5 ([&]{trace << "for " << root.out_path ();});
 
       // Register the test operation.
       //
@@ -64,7 +64,7 @@ namespace build2
       }
 
       const dir_path& out_root (root.out_path ());
-      level5 ([&]{trace << "for " << out_root;});
+      l5 ([&]{trace << "for " << out_root;});
 
       // Register rules.
       //