Move cbsFindInZones so that diff is cleaner.