Make aggregates use weakrefs