diff --git a/src/macro/Environment.cc b/src/macro/Environment.cc
index 822c03c62b0b58656d689c0c6adc5af5efe145a8..25826a5fbb216e978c36c72528f85da8e06b6081 100644
--- a/src/macro/Environment.cc
+++ b/src/macro/Environment.cc
@@ -43,8 +43,7 @@ Environment::define(FunctionPtr func, ExpressionPtr value)
 ExpressionPtr
 Environment::getVariable(const string &name) const
 {
-  auto it = variables.find(name);
-  if (it != variables.end())
+  if (auto it = variables.find(name); it != variables.end())
     return it->second;
 
   if (!parent)
@@ -56,8 +55,7 @@ Environment::getVariable(const string &name) const
 tuple<FunctionPtr, ExpressionPtr>
 Environment::getFunction(const string &name) const
 {
-  auto it = functions.find(name);
-  if (it != functions.end())
+  if (auto it = functions.find(name); it != functions.end())
     return it->second;
 
   if (!parent)