Continue migration to recursive comm2coll