diff --git a/examples/style/hex-layout.sky b/examples/style/hex-layout.sky
index 2633c0f38c..3f223c3955 100644
--- a/examples/style/hex-layout.sky
+++ b/examples/style/hex-layout.sky
@@ -69,22 +69,20 @@
      let loop = children.next();
      while (!loop.done) {
        let child = loop.value;
-       if (child.needsPaint || child.descendantNeedsPaint) {
-         canvas.save();
-         try {
-           canvas.beginPath();
-           canvas.moveTo(child.x, child.y + cellDim/4);
-           canvas.lineTo(child.x + cellDim/2, child.y);
-           canvas.lineTo(child.x + cellDim, child.y + cellDim/4);
-           canvas.lineTo(child.x + cellDim, child.y + 3*cellDim/4);
-           canvas.lineTo(child.x + cellDim/2, child.y + cellDim);
-           canvas.moveTo(child.x, child.y + 3*cellDim/4);
-           canvas.closePath();
-           canvas.clip();
-           this.paintChild(child);
-         } finally {
-           canvas.restore();
-         }
+       canvas.save();
+       try {
+         canvas.beginPath();
+         canvas.moveTo(child.x, child.y + cellDim/4);
+         canvas.lineTo(child.x + cellDim/2, child.y);
+         canvas.lineTo(child.x + cellDim, child.y + cellDim/4);
+         canvas.lineTo(child.x + cellDim, child.y + 3*cellDim/4);
+         canvas.lineTo(child.x + cellDim/2, child.y + cellDim);
+         canvas.moveTo(child.x, child.y + 3*cellDim/4);
+         canvas.closePath();
+         canvas.clip();
+         canvas.paintChild(child);
+       } finally {
+         canvas.restore();
        }
        loop = children.next();
      }
diff --git a/examples/style/toolbar-layout.sky b/examples/style/toolbar-layout.sky
index a10191e4c2..ff9038ca3c 100644
--- a/examples/style/toolbar-layout.sky
+++ b/examples/style/toolbar-layout.sky
@@ -188,9 +188,9 @@ SKY MODULE
      let children = this.walkChildren();
      let loop = children.next();
      while ((!loop.done) && (loop.value != this.firstSkippedChild))
-       this.paintChild(loop.value, canvas);
+       canvas.paintChild(loop.value);
      if (this.showingOverflow)
-       this.paintChild(this.overflowChild, canvas);
+       canvas.paintChild(this.overflowChild);
    }
    function inChild(child, x, y) {
      return (x >= child.x) && (y >= child.y) && (x < child.x+child.width) && (y < child.y+child.height);