diff --git a/src/ast/substitution/substitution.cpp b/src/ast/substitution/substitution.cpp
index 1443b618c..db88b0d6b 100644
--- a/src/ast/substitution/substitution.cpp
+++ b/src/ast/substitution/substitution.cpp
@@ -301,10 +301,8 @@ bool substitution::acyclic(expr_offset p) {
 bool substitution::acyclic() {
     m_color.reset();
     expr_offset r;
-    svector<var_offset>::iterator it  = m_vars.begin();
-    svector<var_offset>::iterator end = m_vars.end();
-    for (; it != end; ++it) {
-        m_subst.find(it->first, it->second, r);
+    for (auto const& [k, v] : m_vars) {
+        m_subst.find(k, v, r);
         if (!acyclic(r))
             return false;
     }
diff --git a/src/util/dlist.h b/src/util/dlist.h
index 1ed183d3d..cd4113457 100644
--- a/src/util/dlist.h
+++ b/src/util/dlist.h
@@ -210,7 +210,7 @@ public:
         return *this;
     }
 
-    T const& operator*() const {
+    T const & operator*() const {
         return *m_elem;
     }
     bool operator!=(dll_iterator const& other) const {