fix grouping with expression in key(s)

- remove spurious rewriting of the source in groupBy
- simplify expr3 with at least one literal argument
- pending test for a trickier case
Actually, the order by was just there so I could eyeball the result, and isn't really relevant to the test, so I'll remove it.