Small changes to EName/QName providers