made _group_aggregate aggregate on one axis at a time (the multiple axes case is handled in _aggregate)
_group_aggregate can now accept (again) several axes at the same time
_aggregate now groups consecutive same-type (group vs axis aggregates) operations
added comments/TODO
style fixes