- #3022 - existing `IsCollectionType` -> `IsEnumerableType` - use new `IsCollectionType` in a few places