diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index 44edd93ed..7525e48e6 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -38,8 +38,8 @@
 #include "ui.h"
 #include "meta-monitor-manager.h"
 
-typedef void (* MetaScreenWindowFunc) (MetaScreen *screen, MetaWindow *window,
-                                       gpointer user_data);
+typedef void (* MetaScreenWindowFunc) (MetaWindow *window,
+                                       gpointer    user_data);
 
 typedef enum
 {
diff --git a/src/core/screen.c b/src/core/screen.c
index 7f61acf2a..bb0d09bf7 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -968,11 +968,11 @@ get_screen_name (MetaDisplay *display,
  * ignoring override-redirect windows.
  */
 void
-meta_screen_foreach_window (MetaScreen *screen,
-                            MetaScreenWindowFunc func,
-                            gpointer data)
+meta_screen_foreach_window (MetaScreen           *screen,
+                            MetaScreenWindowFunc  func,
+                            gpointer              data)
 {
-  GSList *windows, *l;
+  GSList *windows;
 
   /* If we end up doing this often, just keeping a list
    * of windows might be sensible.
@@ -980,11 +980,7 @@ meta_screen_foreach_window (MetaScreen *screen,
 
   windows = meta_display_list_windows (screen->display, META_LIST_DEFAULT);
 
-  for (l = windows; l != NULL; l = l->next)
-    {
-      MetaWindow *window = l->data;
-      func (screen, window, data);
-    }
+  g_slist_foreach (windows, (GFunc) func, data);
 
   g_slist_free (windows);
 }
@@ -2384,9 +2380,8 @@ meta_screen_free_workspace_layout (MetaWorkspaceLayout *layout)
 }
 
 static void
-meta_screen_resize_func (MetaScreen *screen,
-                         MetaWindow *window,
-                         void       *user_data)
+meta_screen_resize_func (MetaWindow *window,
+                         gpointer    user_data)
 {
   if (window->struts)
     {
diff --git a/src/core/workspace.c b/src/core/workspace.c
index f9e1e19eb..4d4541f86 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -158,7 +158,8 @@ meta_workspace_init (MetaWorkspace *workspace)
 }
 
 static void
-maybe_add_to_list (MetaScreen *screen, MetaWindow *window, gpointer data)
+maybe_add_to_list (MetaWindow *window,
+                   gpointer    data)
 {
   GList **mru_list = data;