Change Aggregator from channel-based to mutex-based.

This removes >100 lines of boilerplate code in the Aggregator alone.