diff --git a/src/SymbolTable.cc b/src/SymbolTable.cc
index 69b3eac2a62e95e95e6c0b7b7d0e33a298788726..ec0f3c7022feefe729732f9a174b865c62bf02e5 100644
--- a/src/SymbolTable.cc
+++ b/src/SymbolTable.cc
@@ -461,9 +461,9 @@ SymbolTable::addLagAuxiliaryVarInternal(bool endo, int orig_symb_id, int orig_le
       exit(EXIT_FAILURE);
     }
 
-  aux_var_info = AuxVarInfo(symb_id, (endo ? AuxVarType::endoLag : AuxVarType::exoLag), orig_symb_id,
-			    orig_lead_lag, 0, 0, expr_arg, "");
-  aux_vars.push_back(aux_var_info);
+  AuxVarInfo::aux_var_info = {symb_id, (endo ? AuxVarType::endoLag : AuxVarType::exoLag), orig_symb_id,
+			      orig_lead_lag, 0, 0, expr_arg, ""};
+  aux_vars.emplace_back(aux_var_info);
 
   return symb_id;
 }
@@ -512,7 +512,8 @@ SymbolTable::addExpectationAuxiliaryVar(int information_set, int index,
       exit(EXIT_FAILURE);
     }
 
-  AuxVarInfo aux_var_info = {symb_id, AuxVarType::expectation, 0, 0, 0, information_set, expr_arg, ""};
+  AuxVarInfo aux_var_info = {symb_id, AuxVarType::expectation, 0, 0, 0, information_set,
+			     expr_arg, ""};
   aux_vars.emplace_back(aux_var_info);
 
   return symb_id;
@@ -536,7 +537,8 @@ SymbolTable::addLogTransformAuxiliaryVar(int orig_symb_id, int orig_lead_lag,
       exit(EXIT_FAILURE);
     }
 
-  AuxVarInfo aux_var_info = {symb_id, AuxVarType::logTransform, orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""};
+  AuxVarInfo aux_var_info = {symb_id, AuxVarType::logTransform, orig_symb_id, orig_lead_lag, 0, 0,
+			     expr_arg, ""};
   aux_vars.emplace_back(aux_var_info);
 
   return symb_id;
@@ -559,7 +561,8 @@ SymbolTable::addDiffLagAuxiliaryVar(int index, expr_t expr_arg, int orig_symb_id
       exit(EXIT_FAILURE);
     }
 
-  AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffLag, orig_symb_id, orig_lag, 0, 0, expr_arg, ""};
+  AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffLag, orig_symb_id, orig_lag, 0, 0,
+			     expr_arg, ""};
   aux_vars.emplace_back(aux_var_info);
 
   return symb_id;
@@ -582,7 +585,8 @@ SymbolTable::addDiffLeadAuxiliaryVar(int index, expr_t expr_arg, int orig_symb_i
       exit(EXIT_FAILURE);
     }
 
-  AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffLead, orig_symb_id, orig_lead, 0, 0, expr_arg, ""};
+  AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffLead, orig_symb_id, orig_lead, 0, 0,
+			     expr_arg, ""};
   aux_vars.emplace_back(aux_var_info);
 
   return symb_id;
@@ -605,7 +609,9 @@ SymbolTable::addDiffAuxiliaryVar(int index, expr_t expr_arg, const optional<int>
       exit(EXIT_FAILURE);
     }
 
-  aux_vars.emplace_back(symb_id, AuxVarType::diff, orig_symb_id, orig_lag, 0, 0, expr_arg, "");
+  AuxVarInfo aux_var_info = {symb_id, AuxVarType::diff, move(orig_symb_id), move(orig_lag), 0, 0,
+			     expr_arg, ""};
+  aux_vars.emplace_back(aux_var_info);
 
   return symb_id;
 }
@@ -628,8 +634,9 @@ SymbolTable::addUnaryOpAuxiliaryVar(int index, expr_t expr_arg, string unary_op,
       exit(EXIT_FAILURE);
     }
 
-  aux_vars.emplace_back(symb_id, AuxVarType::unaryOp, orig_symb_id, orig_lag, 0, 0, expr_arg,
-                        move(unary_op));
+  AuxVarInfo::aux_var_info = {symb_id, AuxVarType::unaryOp, move(orig_symb_id), move(orig_lag), 0, 0,
+			      expr_arg, unary_op};
+  aux_vars.push_back(aux_var_info);
 
   return symb_id;
 }
@@ -672,9 +679,9 @@ SymbolTable::addDiffForwardAuxiliaryVar(int orig_symb_id, int orig_lead_lag,
       exit(EXIT_FAILURE);
     }
 
-  AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffForward, orig_symb_id, orig_lead_lag, 0, 0, expr_arg, ""};
+  AuxVarInfo aux_var_info = {symb_id, AuxVarType::diffForward, orig_symb_id, orig_lead_lag, 0, 0,
+			     expr_arg, ""};
   aux_vars.emplace_back(aux_var_info);
-
   return symb_id;
 }
 
@@ -717,7 +724,8 @@ SymbolTable::addPacTargetNonstationaryAuxiliaryVar(const string& name, expr_t ex
       exit(EXIT_FAILURE);
     }
 
-  AuxVarInfo aux_var_info = {symb_id, AuxVarType::pacTargetNonstationary, 0, 0, 0, 0, expr_arg, ""};
+  AuxVarInfo aux_var_info = {symb_id, AuxVarType::pacTargetNonstationary, 0, 0, 0, 0,
+			     expr_arg, ""};
   aux_vars.emplace_back(aux_var_info);
   return symb_id;
 }