Uses refactored empty element tag implementation