Re #7226. Cast the net wider.