diff --git a/jbmc/src/java_bytecode/java_local_variable_table.cpp b/jbmc/src/java_bytecode/java_local_variable_table.cpp
index 00b9608a425..ce3ee7934a3 100644
--- a/jbmc/src/java_bytecode/java_local_variable_table.cpp
+++ b/jbmc/src/java_bytecode/java_local_variable_table.cpp
@@ -85,19 +85,19 @@ struct procedure_local_cfg_baset<
     }
   }
 
-  java_bytecode_convert_methodt::method_offsett
-  get_first_node(const method_with_amapt &args) const
+  static java_bytecode_convert_methodt::method_offsett
+  get_first_node(const method_with_amapt &args)
   {
     return args.second.begin()->first;
   }
 
-  java_bytecode_convert_methodt::method_offsett
-  get_last_node(const method_with_amapt &args) const
+  static java_bytecode_convert_methodt::method_offsett
+  get_last_node(const method_with_amapt &args)
   {
     return (--args.second.end())->first;
   }
 
-  bool nodes_empty(const method_with_amapt &args) const
+  static bool nodes_empty(const method_with_amapt &args)
   {
     return args.second.empty();
   }
diff --git a/src/analyses/cfg_dominators.h b/src/analyses/cfg_dominators.h
index fa7d23ccf0a..41670cc5745 100644
--- a/src/analyses/cfg_dominators.h
+++ b/src/analyses/cfg_dominators.h
@@ -78,13 +78,13 @@ void cfg_dominators_templatet<P, T, post_dom>::fixedpoint(P &program)
 {
   std::list<T> worklist;
 
-  if(cfg.nodes_empty(program))
+  if(cfgt::nodes_empty(program))
     return;
 
   if(post_dom)
-    entry_node=cfg.get_last_node(program);
+    entry_node = cfgt::get_last_node(program);
   else
-    entry_node=cfg.get_first_node(program);
+    entry_node = cfgt::get_first_node(program);
   typename cfgt::nodet &n=cfg[cfg.entry_map[entry_node]];
   n.dominators.insert(entry_node);
 
diff --git a/src/goto-programs/cfg.h b/src/goto-programs/cfg.h
index 7821a54a7ae..f7e8a48d52f 100644
--- a/src/goto-programs/cfg.h
+++ b/src/goto-programs/cfg.h
@@ -170,9 +170,18 @@ class cfg_baset:public grapht< cfg_base_nodet<T, I> >
     compute_edges(goto_functions, goto_program);
   }
 
-  I get_first_node(P &program) const { return program.instructions.begin(); }
-  I get_last_node(P &program) const { return --program.instructions.end(); }
-  bool nodes_empty(P &program) const { return program.instructions.empty(); }
+  static I get_first_node(P &program)
+  {
+    return program.instructions.begin();
+  }
+  static I get_last_node(P &program)
+  {
+    return --program.instructions.end();
+  }
+  static bool nodes_empty(P &program)
+  {
+    return program.instructions.empty();
+  }
 };
 
 template<class T,