diff --git a/src/EventTrace.cc b/src/EventTrace.cc
index e962636945..e265faf903 100644
--- a/src/EventTrace.cc
+++ b/src/EventTrace.cc
@@ -844,8 +844,7 @@ void ValTraceMgr::AssessChange(const ValTrace* vt, const ValTrace* prev_vt) {
 
 void ValTraceMgr::TrackVar(const Val* v) {
     std::string base_name = IsUnsupported(v) ? "UNSUPPORTED" : "val";
-    auto val_name = "__" + base_name + std::to_string(num_vars++);
-    val_names[v] = val_name;
+    val_names[v] = "__" + base_name + std::to_string(num_vars++);
 }
 
 std::string ValTraceMgr::GenValName(const ValPtr& v) {
diff --git a/src/Type.cc b/src/Type.cc
index 2cb68da590..c014cae1b1 100644
--- a/src/Type.cc
+++ b/src/Type.cc
@@ -1052,8 +1052,7 @@ void RecordType::AddField(unsigned int field, const TypeDecl* td) {
 
     if ( def_expr && ! IsErrorType(type->Tag()) ) {
         if ( def_expr->Tag() == detail::EXPR_CONST ) {
-            auto v = def_expr->Eval(nullptr);
-            auto zv = ZVal(v, type);
+            auto zv = ZVal(def_expr->Eval(nullptr), type);
 
             if ( ZVal::IsManagedType(type) )
                 init = std::make_unique<detail::DirectManagedFieldInit>(zv);
diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc
index 24f2e97b48..9921c9b15d 100644
--- a/src/supervisor/Supervisor.cc
+++ b/src/supervisor/Supervisor.cc
@@ -1240,9 +1240,7 @@ Supervisor::NodeConfig Supervisor::NodeConfig::FromRecord(const RecordVal* node)
 
         auto key = env_table_val->RecreateIndex(*k);
         auto name = key->Idx(0)->AsStringVal()->ToStdString();
-        auto val = v->GetVal()->AsStringVal()->ToStdString();
-
-        rval.env[name] = val;
+        rval.env[name] = v->GetVal()->AsStringVal()->ToStdString();
     }
 
     auto cluster_table_val = node->GetField("cluster")->AsTableVal();