diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc
index 595f589f98..68e88caea1 100644
--- a/libs/canvas/item.cc
+++ b/libs/canvas/item.cc
@@ -1010,19 +1010,19 @@ Item::add_child_bounding_boxes (bool include_hidden) const
 		have_one = true;
 	}
 
-	for (list<Item*>::const_iterator i = _items.begin(); i != _items.end(); ++i) {
+	for (auto const & item : _items) {
 
-		if (!(*i)->visible() && !include_hidden) {
+		if (!item->visible() && !include_hidden) {
 			continue;
 		}
 
-		Rect item_bbox = (*i)->bounding_box ();
+		Rect item_bbox = item->bounding_box ();
 
 		if (!item_bbox) {
 			continue;
 		}
 
-		Rect child_bbox = (*i)->item_to_parent (item_bbox);
+		Rect child_bbox = item->item_to_parent (item_bbox);
 		if (have_one) {
 			bbox = bbox.extend (child_bbox);
 		} else {
diff --git a/libs/canvas/lookup_table.cc b/libs/canvas/lookup_table.cc
index 3c2908eead..e3c2d85b76 100644
--- a/libs/canvas/lookup_table.cc
+++ b/libs/canvas/lookup_table.cc
@@ -44,15 +44,14 @@ DumbLookupTable::DumbLookupTable (Item const & item)
 vector<Item *>
 DumbLookupTable::get (Rect const &area)
 {
-	list<Item *> const & items = _item.items ();
 	vector<Item *> vitems;
 #if 1
-	for (list<Item *>::const_iterator i = items.begin(); i != items.end(); ++i) {
-		Rect item_bbox = (*i)->bounding_box ();
+	for (auto const & item : _item.items()) {
+		Rect item_bbox = item->bounding_box ();
 		if (!item_bbox) continue;
-		Rect item = (*i)->item_to_window (item_bbox);
-		if (item.intersection (area)) {
-			vitems.push_back (*i);
+		Rect item_rect = item->item_to_window (item_bbox);
+		if (item_rect.intersection (area)) {
+			vitems.push_back (item);
 		}
 	}
 #else
@@ -66,13 +65,12 @@ DumbLookupTable::items_at_point (Duple const & point) const
 {
 	/* Point is in window coordinate system */
 
-	list<Item *> const & items (_item.items ());
 	vector<Item *> vitems;
 
-	for (list<Item *>::const_iterator i = items.begin(); i != items.end(); ++i) {
+	for (auto const & item : _item.items()) {
 
-		if ((*i)->covers (point)) {
-			vitems.push_back (*i);
+		if (item->covers (point)) {
+			vitems.push_back (item);
 		}
 	}
 
@@ -84,16 +82,15 @@ DumbLookupTable::has_item_at_point (Duple const & point) const
 {
 	/* Point is in window coordinate system */
 
-	list<Item *> const & items (_item.items ());
 	vector<Item *> vitems;
 
-	for (list<Item *>::const_iterator i = items.begin(); i != items.end(); ++i) {
+	for (auto const & item : _item.items()) {
 
-		if (!(*i)->visible()) {
+		if (!item->visible()) {
 			continue;
 		}
 
-		if ((*i)->covers (point)) {
+		if (item->covers (point)) {
 			// std::cerr << "\t\t" << (*i)->whatami() << '/' << (*i)->name << " covers " << point << std::endl;
 			return true;
 
@@ -133,16 +130,15 @@ OptimizingLookupTable::OptimizingLookupTable (Item const & item, int items_per_c
 
 //	cout << "BUILD bbox=" << bbox << ", cellsize=" << _cell_size << ", offset=" << _offset << ", dimension=" << _dimension << "\n";
 
-	for (list<Item*>::const_iterator i = items.begin(); i != items.end(); ++i) {
-
+	for (auto const & our_item : _item.items()) {
 		/* item bbox in its own coordinates */
-		Rect item_bbox = (*i)->bounding_box ();
+		Rect item_bbox = our_item->bounding_box ();
 		if (!item_bbox) {
 			continue;
 		}
 
 		/* and in the item's coordinates */
-		Rect const item_bbox_in_item = (*i)->item_to_parent (item_bbox);
+		Rect const item_bbox_in_item = our_item->item_to_parent (item_bbox);
 
 		int x0, y0, x1, y1;
 		area_to_indices (item_bbox_in_item, x0, y0, x1, y1);
@@ -176,7 +172,7 @@ OptimizingLookupTable::OptimizingLookupTable (Item const & item, int items_per_c
 
 		for (int x = x0; x < x1; ++x) {
 			for (int y = y0; y < y1; ++y) {
-				_cells[x][y].push_back (*i);
+				_cells[x][y].push_back (our_item);
 			}
 		}
 	}