Issue #18760: Improved cross-references in the xml package.