LPS-33455 Use generic inference empty collection methods, don't use raw types