Taxonomy Promotion: Further fixes.