Part-way through fix of TypeBirthDeath.