diff --git a/src/frontend/terminaloverlay.cc b/src/frontend/terminaloverlay.cc
index 4186c02..ee8a615 100644
--- a/src/frontend/terminaloverlay.cc
+++ b/src/frontend/terminaloverlay.cc
@@ -300,7 +300,11 @@ void TitleEngine::set_prefix( const wstring s )
 
 void ConditionalOverlayRow::apply( Framebuffer &fb, uint64_t confirmed_epoch, bool flag ) const
 {
-  for_each( overlay_cells.begin(), overlay_cells.end(), bind( &ConditionalOverlayCell::apply, _1, var(fb), confirmed_epoch, row_num, flag ) );
+  for ( overlay_cells_t::const_iterator it = overlay_cells.begin();
+        it != overlay_cells.end();
+        it++ ) {
+    it->apply( fb, confirmed_epoch, row_num, flag );
+  }
 }
 
 void PredictionEngine::apply( Framebuffer &fb ) const
@@ -310,9 +314,17 @@ void PredictionEngine::apply( Framebuffer &fb ) const
 						 || (display_preference == Always) );
 
   if ( show ) {
-    for_each( cursors.begin(), cursors.end(), bind( &ConditionalCursorMove::apply, _1, var(fb), confirmed_epoch ) );
+    for ( cursors_t::const_iterator it = cursors.begin();
+          it != cursors.end();
+          it++ ) {
+      it->apply( fb, confirmed_epoch );
+    }
 
-    for_each( overlays.begin(), overlays.end(), bind( &ConditionalOverlayRow::apply, _1, var(fb), confirmed_epoch, flagging ) );
+    for ( overlays_t::const_iterator it = overlays.begin();
+          it != overlays.end();
+          it++ ) {
+      it->apply( fb, confirmed_epoch, flagging );
+    }
   }
 }
 
diff --git a/src/frontend/terminaloverlay.h b/src/frontend/terminaloverlay.h
index 7715beb..71ef3f2 100644
--- a/src/frontend/terminaloverlay.h
+++ b/src/frontend/terminaloverlay.h
@@ -159,7 +159,8 @@ namespace Overlay {
     typedef list<ConditionalOverlayRow> overlays_t;
     overlays_t overlays;
 
-    list<ConditionalCursorMove> cursors;
+    typedef list<ConditionalCursorMove> cursors_t;
+    cursors_t cursors;
 
     typedef ConditionalOverlayRow::overlay_cells_t overlay_cells_t;