Won't the aggregate now (correctly) always be the self contact?  So hopefully we shouldn't need to find the aggregate.