Support DefaultIfEmpty and Count. Fix some broken GroupBy tests.