OK, done.

I removed set_aggregate -- it's not used, and we can easily add it back if we ever need it.