Issue #22393: Steve's awesome groupby fix and some other formatting fixes