Fixing groupByUntil with comparer