Undoing the change I made back in 10530033938392c91499df006cc99cbdf1622790 ; I can't remember now what exactly motivated that, but I don't think it's necessary anymore (undoing it doesn't break any existing tests at least).  In any case this is one small necessary step toward the reworked handling of model instances in compound models.