Taxonomy Promotion: Handle non-JS situations much better.