diff --git a/app/display/gimpcanvasarc.c b/app/display/gimpcanvasarc.c
index a0f903515d2df3ca94e082ad634f8426ad286f25..7650e010291cf9d3584c8d6d79b705aed3d00a28 100644
--- a/app/display/gimpcanvasarc.c
+++ b/app/display/gimpcanvasarc.c
@@ -279,9 +279,9 @@ gimp_canvas_arc_draw (GimpCanvasItem   *item,
   cairo_restore (cr);
 
   if (private->filled)
-    _gimp_canvas_item_fill (item, shell, cr);
+    _gimp_canvas_item_fill (item, cr);
   else
-    _gimp_canvas_item_stroke (item, shell, cr);
+    _gimp_canvas_item_stroke (item, cr);
 }
 
 static GdkRegion *
diff --git a/app/display/gimpcanvasboundary.c b/app/display/gimpcanvasboundary.c
index 7b351c4ec118e87725055bdc18efcbb2271b9be8..b9c25998a13adbb8d9fe3a9e386c29ee1d4697e4 100644
--- a/app/display/gimpcanvasboundary.c
+++ b/app/display/gimpcanvasboundary.c
@@ -242,7 +242,7 @@ gimp_canvas_boundary_draw (GimpCanvasItem   *item,
 
   gimp_cairo_add_segments (cr, segs, private->n_segs);
 
-  _gimp_canvas_item_stroke (item, shell, cr);
+  _gimp_canvas_item_stroke (item, cr);
 
   g_free (segs);
 }
diff --git a/app/display/gimpcanvascorner.c b/app/display/gimpcanvascorner.c
index e7b6357affd2957c384b1bb92c041319664fddab..5e492348158c17e5d3cb75e36b628dde61a09ac3 100644
--- a/app/display/gimpcanvascorner.c
+++ b/app/display/gimpcanvascorner.c
@@ -405,7 +405,7 @@ gimp_canvas_corner_draw (GimpCanvasItem   *item,
 
   cairo_rectangle (cr, x, y, w, h);
 
-  _gimp_canvas_item_stroke (item, shell, cr);
+  _gimp_canvas_item_stroke (item, cr);
 }
 
 static GdkRegion *
diff --git a/app/display/gimpcanvasgroup.c b/app/display/gimpcanvasgroup.c
index 7a7775e7239208a90db3d9f42939f707c8b284a2..641d6f4d7535eb14990bc685bb68a3a1e7572ab5 100644
--- a/app/display/gimpcanvasgroup.c
+++ b/app/display/gimpcanvasgroup.c
@@ -185,14 +185,14 @@ gimp_canvas_group_draw (GimpCanvasItem   *item,
     {
       GimpCanvasItem *sub_item = list->data;
 
-      gimp_canvas_item_draw (sub_item, shell, cr);
+      gimp_canvas_item_draw (sub_item, cr);
     }
 
   if (private->group_stroking)
-    _gimp_canvas_item_stroke (item, shell, cr);
+    _gimp_canvas_item_stroke (item, cr);
 
   if (private->group_filling)
-    _gimp_canvas_item_fill (item, shell, cr);
+    _gimp_canvas_item_fill (item, cr);
 }
 
 static GdkRegion *
@@ -206,8 +206,7 @@ gimp_canvas_group_get_extents (GimpCanvasItem   *item,
   for (list = private->items; list; list = g_list_next (list))
     {
       GimpCanvasItem *sub_item   = list->data;
-      GdkRegion      *sub_region = gimp_canvas_item_get_extents (sub_item,
-                                                                 shell);
+      GdkRegion      *sub_region = gimp_canvas_item_get_extents (sub_item);
 
       if (! region)
         {
diff --git a/app/display/gimpcanvasguide.c b/app/display/gimpcanvasguide.c
index ebaa5375fd25af99a2d9527a8abc64951a70cada..2102e64eb31ec20945264a1e3e09b74502b26906 100644
--- a/app/display/gimpcanvasguide.c
+++ b/app/display/gimpcanvasguide.c
@@ -223,7 +223,7 @@ gimp_canvas_guide_draw (GimpCanvasItem   *item,
   cairo_move_to (cr, x1, y1);
   cairo_line_to (cr, x2, y2);
 
-  _gimp_canvas_item_stroke (item, shell, cr);
+  _gimp_canvas_item_stroke (item, cr);
 }
 
 static GdkRegion *
diff --git a/app/display/gimpcanvashandle.c b/app/display/gimpcanvashandle.c
index 02634e70a8e853a45a250394563a9587de077ca3..fbe7a372ed247db7ed35b930c139db216a1389c3 100644
--- a/app/display/gimpcanvashandle.c
+++ b/app/display/gimpcanvashandle.c
@@ -425,13 +425,13 @@ gimp_canvas_handle_draw (GimpCanvasItem   *item,
     case GIMP_HANDLE_SQUARE:
       cairo_rectangle (cr, x, y, private->width - 1.0, private->height - 1.0);
 
-      _gimp_canvas_item_stroke (item, shell, cr);
+      _gimp_canvas_item_stroke (item, cr);
       break;
 
     case GIMP_HANDLE_FILLED_SQUARE:
       cairo_rectangle (cr, x - 0.5, y - 0.5, private->width, private->height);
 
-      _gimp_canvas_item_fill (item, shell, cr);
+      _gimp_canvas_item_fill (item, cr);
       break;
 
     case GIMP_HANDLE_CIRCLE:
@@ -439,7 +439,7 @@ gimp_canvas_handle_draw (GimpCanvasItem   *item,
                           private->start_angle,
                           private->slice_angle);
 
-      _gimp_canvas_item_stroke (item, shell, cr);
+      _gimp_canvas_item_stroke (item, cr);
       break;
 
     case GIMP_HANDLE_FILLED_CIRCLE:
@@ -449,7 +449,7 @@ gimp_canvas_handle_draw (GimpCanvasItem   *item,
                           private->start_angle,
                           private->slice_angle);
 
-      _gimp_canvas_item_fill (item, shell, cr);
+      _gimp_canvas_item_fill (item, cr);
       break;
 
     case GIMP_HANDLE_CROSS:
@@ -459,7 +459,7 @@ gimp_canvas_handle_draw (GimpCanvasItem   *item,
       cairo_move_to (cr, x, y - private->height / 2);
       cairo_line_to (cr, x, y + private->height / 2);
 
-      _gimp_canvas_item_stroke (item, shell, cr);
+      _gimp_canvas_item_stroke (item, cr);
       break;
 
     default:
diff --git a/app/display/gimpcanvasitem.c b/app/display/gimpcanvasitem.c
index 4521a4244d332a149a0050f228a40bfaefc8eb30..b58bcb915c58aee42b8af204e9a6adf9c4e5bb1d 100644
--- a/app/display/gimpcanvasitem.c
+++ b/app/display/gimpcanvasitem.c
@@ -252,29 +252,33 @@ gimp_canvas_item_real_fill (GimpCanvasItem   *item,
 /*  public functions  */
 
 void
-gimp_canvas_item_draw (GimpCanvasItem   *item,
-                       GimpDisplayShell *shell,
-                       cairo_t          *cr)
+gimp_canvas_item_draw (GimpCanvasItem *item,
+                       cairo_t        *cr)
 {
+  GimpCanvasItemPrivate *private;
+
   g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
-  g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
   g_return_if_fail (cr != NULL);
 
+  private = GET_PRIVATE (item);
+
   cairo_save (cr);
 
-  GIMP_CANVAS_ITEM_GET_CLASS (item)->draw (item, shell, cr);
+  GIMP_CANVAS_ITEM_GET_CLASS (item)->draw (item, private->shell, cr);
 
   cairo_restore (cr);
 }
 
 GdkRegion *
-gimp_canvas_item_get_extents (GimpCanvasItem   *item,
-                              GimpDisplayShell *shell)
+gimp_canvas_item_get_extents (GimpCanvasItem *item)
 {
+  GimpCanvasItemPrivate *private;
+
   g_return_val_if_fail (GIMP_IS_CANVAS_ITEM (item), NULL);
-  g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
 
-  return GIMP_CANVAS_ITEM_GET_CLASS (item)->get_extents (item, shell);
+  private = GET_PRIVATE (item);
+
+  return GIMP_CANVAS_ITEM_GET_CLASS (item)->get_extents (item, private->shell);
 }
 
 void
@@ -367,9 +371,8 @@ gimp_canvas_item_resume_filling (GimpCanvasItem *item)
 /*  protected functions  */
 
 void
-_gimp_canvas_item_stroke (GimpCanvasItem   *item,
-                          GimpDisplayShell *shell,
-                          cairo_t          *cr)
+_gimp_canvas_item_stroke (GimpCanvasItem *item,
+                          cairo_t        *cr)
 {
   GimpCanvasItemPrivate *private = GET_PRIVATE (item);
 
@@ -378,7 +381,7 @@ _gimp_canvas_item_stroke (GimpCanvasItem   *item,
 
   if (private->suspend_stroking == 0)
     {
-      GIMP_CANVAS_ITEM_GET_CLASS (item)->stroke (item, shell, cr);
+      GIMP_CANVAS_ITEM_GET_CLASS (item)->stroke (item, private->shell, cr);
     }
   else
     {
@@ -388,7 +391,6 @@ _gimp_canvas_item_stroke (GimpCanvasItem   *item,
 
 void
 _gimp_canvas_item_fill (GimpCanvasItem   *item,
-                        GimpDisplayShell *shell,
                         cairo_t          *cr)
 {
   GimpCanvasItemPrivate *private = GET_PRIVATE (item);
@@ -398,7 +400,7 @@ _gimp_canvas_item_fill (GimpCanvasItem   *item,
 
   if (private->suspend_filling == 0)
     {
-      GIMP_CANVAS_ITEM_GET_CLASS (item)->fill (item, shell, cr);
+      GIMP_CANVAS_ITEM_GET_CLASS (item)->fill (item, private->shell, cr);
     }
   else
     {
diff --git a/app/display/gimpcanvasitem.h b/app/display/gimpcanvasitem.h
index c086e0bb41d23566642361802357bf5f84dc197d..f878550906ee881e6ecc4e37f39c2567dea2feb1 100644
--- a/app/display/gimpcanvasitem.h
+++ b/app/display/gimpcanvasitem.h
@@ -62,10 +62,8 @@ struct _GimpCanvasItemClass
 GType       gimp_canvas_item_get_type         (void) G_GNUC_CONST;
 
 void        gimp_canvas_item_draw             (GimpCanvasItem   *item,
-                                               GimpDisplayShell *shell,
                                                cairo_t          *cr);
-GdkRegion * gimp_canvas_item_get_extents      (GimpCanvasItem   *item,
-                                               GimpDisplayShell *shell);
+GdkRegion * gimp_canvas_item_get_extents      (GimpCanvasItem   *item);
 
 void        gimp_canvas_item_set_line_cap     (GimpCanvasItem   *item,
                                                cairo_line_cap_t  line_cap);
@@ -84,10 +82,8 @@ void        gimp_canvas_item_resume_filling   (GimpCanvasItem   *item);
 /*  protected  */
 
 void        _gimp_canvas_item_stroke          (GimpCanvasItem   *item,
-                                               GimpDisplayShell *shell,
                                                cairo_t          *cr);
 void        _gimp_canvas_item_fill            (GimpCanvasItem   *item,
-                                               GimpDisplayShell *shell,
                                                cairo_t          *cr);
 
 
diff --git a/app/display/gimpcanvasline.c b/app/display/gimpcanvasline.c
index 8b01b98c2be1b82f18b1c5b9231463de5acc3f73..a60c953fac76635338b0e27b1a5005f192f33239 100644
--- a/app/display/gimpcanvasline.c
+++ b/app/display/gimpcanvasline.c
@@ -219,7 +219,7 @@ gimp_canvas_line_draw (GimpCanvasItem   *item,
   cairo_move_to (cr, x1, y1);
   cairo_line_to (cr, x2, y2);
 
-  _gimp_canvas_item_stroke (item, shell, cr);
+  _gimp_canvas_item_stroke (item, cr);
 }
 
 static GdkRegion *
diff --git a/app/display/gimpcanvaspolygon.c b/app/display/gimpcanvaspolygon.c
index b0a5fa872571acece8f96c0365173554ea53f3e4..90d5c803e5d1a076f01766600a37f9f5603843bd 100644
--- a/app/display/gimpcanvaspolygon.c
+++ b/app/display/gimpcanvaspolygon.c
@@ -213,9 +213,9 @@ gimp_canvas_polygon_draw (GimpCanvasItem   *item,
     }
 
   if (private->filled)
-    _gimp_canvas_item_fill (item, shell, cr);
+    _gimp_canvas_item_fill (item, cr);
   else
-    _gimp_canvas_item_stroke (item, shell, cr);
+    _gimp_canvas_item_stroke (item, cr);
 
   g_free (points);
 }
diff --git a/app/display/gimpcanvasrectangle.c b/app/display/gimpcanvasrectangle.c
index 131ee401db29f58863fcdeda6bbf32eda0cedf8e..71202b732ed016beeff887998a3bb60eceb7a68e 100644
--- a/app/display/gimpcanvasrectangle.c
+++ b/app/display/gimpcanvasrectangle.c
@@ -253,9 +253,9 @@ gimp_canvas_rectangle_draw (GimpCanvasItem   *item,
   cairo_rectangle (cr, x, y, w, h);
 
   if (private->filled)
-    _gimp_canvas_item_fill (item, shell, cr);
+    _gimp_canvas_item_fill (item, cr);
   else
-    _gimp_canvas_item_stroke (item, shell, cr);
+    _gimp_canvas_item_stroke (item, cr);
 }
 
 static GdkRegion *
diff --git a/app/display/gimpcanvassamplepoint.c b/app/display/gimpcanvassamplepoint.c
index cd60d85eaa5eaa309dd817fb6f67c93c84b2765d..acff04dea46ec8f4dabb5d73885d67d9d3ab4f65 100644
--- a/app/display/gimpcanvassamplepoint.c
+++ b/app/display/gimpcanvassamplepoint.c
@@ -246,7 +246,7 @@ gimp_canvas_sample_point_draw (GimpCanvasItem   *item,
 
   cairo_arc_negative (cr, x, y, HALF_SIZE, 0.0, 0.5 * G_PI);
 
-  _gimp_canvas_item_stroke (item, shell, cr);
+  _gimp_canvas_item_stroke (item, cr);
 
   layout = gimp_canvas_get_layout (GIMP_CANVAS (shell->canvas),
                                    "%d", private->index);
@@ -254,7 +254,7 @@ gimp_canvas_sample_point_draw (GimpCanvasItem   *item,
   cairo_move_to (cr, x + 2.5, y + 2.5);
   pango_cairo_show_layout (cr, layout);
 
-  _gimp_canvas_item_fill (item, shell, cr);
+  _gimp_canvas_item_fill (item, cr);
 }
 
 static GdkRegion *
diff --git a/app/display/gimpcanvastextcursor.c b/app/display/gimpcanvastextcursor.c
index 34d6b59538dc81ebe62586f328e935ca4bb16471..e21a795ebf392cc7aa01a099b4bec2d7983ab607 100644
--- a/app/display/gimpcanvastextcursor.c
+++ b/app/display/gimpcanvastextcursor.c
@@ -261,7 +261,7 @@ gimp_canvas_text_cursor_draw (GimpCanvasItem   *item,
       cairo_line_to (cr, x + 3.0, y + h);
     }
 
-  _gimp_canvas_item_stroke (item, shell, cr);
+  _gimp_canvas_item_stroke (item, cr);
 }
 
 static GdkRegion *
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index 61f2f29ffc6236c218e59cebd64a7b232f73cf9e..95085027737787c67f031134f86ef55bdf36d0f1 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -2342,7 +2342,7 @@ gimp_display_shell_canvas_expose_image (GimpDisplayShell *shell,
 
   /* draw canvas items */
   cairo_save (cr);
-  gimp_canvas_item_draw (shell->canvas_item, shell, cr);
+  gimp_canvas_item_draw (shell->canvas_item, cr);
   cairo_restore (cr);
 
   /* and the cursor (if we have a software cursor) */
diff --git a/app/display/gimpdisplayshell-expose.c b/app/display/gimpdisplayshell-expose.c
index b3e8abbe094b5a08262b650dc0eee5125eef81d0..eb959b0d67ec972fbe4ecb4612b181c8efd250fa 100644
--- a/app/display/gimpdisplayshell-expose.c
+++ b/app/display/gimpdisplayshell-expose.c
@@ -73,7 +73,7 @@ gimp_display_shell_expose_item (GimpDisplayShell *shell,
   g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
   g_return_if_fail (GIMP_IS_CANVAS_ITEM (item));
 
-  region = gimp_canvas_item_get_extents (item, shell);
+  region = gimp_canvas_item_get_extents (item);
 
   if (region)
     {