Reverted use of value classes for EName/QName