diff --git a/src/pointer-analysis/value_set_fi.cpp b/src/pointer-analysis/value_set_fi.cpp
index a87a460c703..ab422757d18 100644
--- a/src/pointer-analysis/value_set_fi.cpp
+++ b/src/pointer-analysis/value_set_fi.cpp
@@ -712,17 +712,17 @@ void value_set_fit::get_reference_set(
 
   forall_objects(it, object_map.read())
   {
-    const exprt &expr = object_numbering[it->first];
+    const exprt &object = object_numbering[it->first];
 
-    if(expr.type().id()=="#REF#")
+    if(object.type().id() == "#REF#")
     {
-      const irep_idt &ident = expr.get(ID_identifier);
+      const irep_idt &ident = object.get(ID_identifier);
       valuest::const_iterator vit = values.find(ident);
       if(vit==values.end())
       {
         // Assume the variable never was assigned,
         // so assume it's reference set is unknown.
-        dest.insert(exprt(ID_unknown, expr.type()));
+        dest.insert(exprt(ID_unknown, object.type()));
       }
       else
       {
@@ -741,8 +741,8 @@ void value_set_fit::get_reference_set(
             t_it->second.reset();
         }
 
-        forall_objects(it, omt.read())
-          dest.insert(to_expr(*it));
+        for(const auto &o : omt.read())
+          dest.insert(to_expr(o));
       }
     }
     else
diff --git a/src/pointer-analysis/value_set_fivr.cpp b/src/pointer-analysis/value_set_fivr.cpp
index 68e519a186e..68c5c5058d6 100644
--- a/src/pointer-analysis/value_set_fivr.cpp
+++ b/src/pointer-analysis/value_set_fivr.cpp
@@ -824,17 +824,17 @@ void value_set_fivrt::get_reference_set(
 
   forall_objects(it, object_map.read())
   {
-    const exprt &expr=object_numbering[it->first];
+    const exprt &object = object_numbering[it->first];
 
-    if(expr.type().id()=="#REF#")
+    if(object.type().id() == "#REF#")
     {
-      const irep_idt &ident=expr.get(ID_identifier);
+      const irep_idt &ident = object.get(ID_identifier);
       valuest::const_iterator vit=values.find(ident);
       if(vit==values.end())
       {
         // Assume the variable never was assigned,
         // so assume it's reference set is unknown.
-        dest.insert(exprt(ID_unknown, expr.type()));
+        dest.insert(exprt(ID_unknown, object.type()));
       }
       else
       {
@@ -853,8 +853,8 @@ void value_set_fivrt::get_reference_set(
             t_it->second.reset();
         }
 
-        forall_objects(it, omt.read())
-          dest.insert(to_expr(it));
+        forall_objects(it2, omt.read())
+          dest.insert(to_expr(it2));
       }
     }
     else