diff --git a/glsl_parser_extras.cpp b/glsl_parser_extras.cpp
index 84a3fd9..538d77c 100644
--- a/glsl_parser_extras.cpp
+++ b/glsl_parser_extras.cpp
@@ -651,10 +651,8 @@
    /* Optimization passes */
    if (!state.error) {
       /* Constant folding */
-      foreach_iter(exec_list_iterator, iter, instructions) {
-	 ir_constant_folding_visitor v;
-	 ((ir_instruction *)iter.get())->accept(& v);
-      }
+      ir_constant_folding_visitor constant_folding;
+      visit_exec_list(&instructions, &constant_folding);
    }
 
    /* Print out the resulting IR */