Add template support for baseline partial non-g classes in models.