Simplify groupby constructions, speeds things up a bit on level ops