Despite seeming like a lot of change this is mostly just extraction to run via the tests. I can break out into a couple of refactor commits for reviewablility.

I have tested this on mysql 5.6 with full group by mode enabled.