diff --git a/src/commands/CmdCancel.cpp b/src/commands/CmdCancel.cpp
index 0599daf1..9f88856d 100644
--- a/src/commands/CmdCancel.cpp
+++ b/src/commands/CmdCancel.cpp
@@ -34,7 +34,7 @@ int CmdCancel (
   Database& database,
   Journal& journal)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   // If there is an open interval, cancel it by deleting it..
   auto latest = getLatestInterval (database);
diff --git a/src/commands/CmdChart.cpp b/src/commands/CmdChart.cpp
index e52d0986..4561c47d 100644
--- a/src/commands/CmdChart.cpp
+++ b/src/commands/CmdChart.cpp
@@ -92,7 +92,7 @@ int renderChart (
   Rules& rules,
   Database& database)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   // Load the data.
   const auto tracked = getTracked (database, rules, filter);
diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp
index 05aa5c40..380ae1c1 100644
--- a/src/commands/CmdConfig.cpp
+++ b/src/commands/CmdConfig.cpp
@@ -56,7 +56,7 @@ int CmdConfig (
     return CmdShow (rules);
   }
 
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   bool confirmation = rules.getBoolean ("confirmation");
   std::string name = words[0];
diff --git a/src/commands/CmdDefault.cpp b/src/commands/CmdDefault.cpp
index 19346f0f..244d5ea7 100644
--- a/src/commands/CmdDefault.cpp
+++ b/src/commands/CmdDefault.cpp
@@ -32,7 +32,7 @@
 // Returns 0 if tracking is active, 1 if not.
 int CmdDefault (Rules& rules, Database& database)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   // Load the most recent interval, summarize and display.
   auto interval = getLatestInterval (database);
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index e972d7a6..b59dca26 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -36,7 +36,7 @@ int CmdDelete (
   Database& database,
   Journal& journal)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   // Gather IDs.
   std::set <int> ids = cli.getIds ();
diff --git a/src/commands/CmdFill.cpp b/src/commands/CmdFill.cpp
index 43ee5272..c79c7938 100644
--- a/src/commands/CmdFill.cpp
+++ b/src/commands/CmdFill.cpp
@@ -37,7 +37,7 @@ int CmdFill (
   Database& database,
   Journal& journal)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   std::set <int> ids = cli.getIds ();
 
diff --git a/src/commands/CmdGaps.cpp b/src/commands/CmdGaps.cpp
index 75e84d0a..900efd68 100644
--- a/src/commands/CmdGaps.cpp
+++ b/src/commands/CmdGaps.cpp
@@ -37,7 +37,7 @@ int CmdGaps (
   Rules& rules,
   Database& database)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   // If filter is empty, choose 'today'.
   auto filter = cli.getFilter ();
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 035876aa..489a0b3c 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -37,7 +37,7 @@ int CmdModify (
   Database& database,
   Journal& journal)
 {
-  bool verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   auto filter = cli.getFilter ();
   std::set <int> ids = cli.getIds ();
diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp
index 1bf0eff0..6962c1be 100644
--- a/src/commands/CmdStart.cpp
+++ b/src/commands/CmdStart.cpp
@@ -35,7 +35,7 @@ int CmdStart (
   Database& database,
   Journal& journal)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
   const Datetime now {};
 
   auto interval = cli.getFilter ({now, 0});
diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp
index 02166641..4de2661b 100644
--- a/src/commands/CmdStop.cpp
+++ b/src/commands/CmdStop.cpp
@@ -47,7 +47,7 @@ int CmdStop (
   Database& database,
   Journal& journal)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   // Load the most recent interval.
   auto filter = cli.getFilter ();
diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp
index 1c6435dc..2593e649 100644
--- a/src/commands/CmdSummary.cpp
+++ b/src/commands/CmdSummary.cpp
@@ -42,7 +42,7 @@ int CmdSummary (
   Rules& rules,
   Database& database)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   // Create a filter, and if empty, choose 'today'.
   auto filter = cli.getFilter (Range { Datetime ("today"), Datetime ("tomorrow") });
diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp
index c024a40f..1b792305 100644
--- a/src/commands/CmdTags.cpp
+++ b/src/commands/CmdTags.cpp
@@ -38,7 +38,7 @@ int CmdTags (
   Rules& rules,
   Database& database)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   // Create a filter, with no default range.
   auto filter = cli.getFilter ();
diff --git a/src/commands/CmdTrack.cpp b/src/commands/CmdTrack.cpp
index 5e9d6e8a..00bc1fd1 100644
--- a/src/commands/CmdTrack.cpp
+++ b/src/commands/CmdTrack.cpp
@@ -35,7 +35,7 @@ int CmdTrack (
   Database& database,
   Journal& journal)
 {
-  auto boolean = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   auto filter = cli.getFilter ();
 
@@ -52,9 +52,9 @@ int CmdTrack (
 
   for (auto& interval : flatten (filter, getAllExclusions (rules, filter)))
   {
-    database.addInterval (interval, boolean);
+    database.addInterval (interval, verbose);
 
-    if (boolean)
+    if (verbose)
       std::cout << intervalSummarize (database, rules, interval);
   }
 
diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp
index 3bf15747..d0afe9c2 100644
--- a/src/commands/CmdUndo.cpp
+++ b/src/commands/CmdUndo.cpp
@@ -62,7 +62,7 @@ static void undoConfigAction (UndoAction& action, Rules &rules, Journal& journal
 ////////////////////////////////////////////////////////////////////////////////
 int CmdUndo (Rules& rules, Database& database, Journal& journal)
 {
-  auto verbose = rules.getBoolean ("verbose");
+  const bool verbose = rules.getBoolean ("verbose");
 
   Transaction transaction = journal.popLastTransaction ();