Preserve partitioning in ForEachConverter