Tweak groupings more in prep for UberGroupings