This is the key change - creating a no_newaggregate early on.  The other changes are follow on issues/consequences.