Make similar changes to the previous commit for _xml_id.