ref #6401 Improve generics for TypeDesignationStatusBase and RelationshipTermBase