Getting basic multiaggregates working and cleaning up some of the tuple
stuff.