Make GROUP BY more explicit to prevent "Expression #1 of SELECT list is not in GROUP BY clause and contains nonaggregated column which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by" that pops up when running these SQL statements on MySQL 5.7.
NOTE: These changes have not been tested on pre 5.7 versions.
NOTE: These changes have not been tested on pre 5.7 versions.
Sorry about the whitespace noise in the diff.