... which is incidentally the last user of XDocumentInfo.

Change-Id: I47dc31c8739aa1d50c2a3b26ac51a239417fa5b0