Change groupBy semantics so as not to do implicit unnesting