Shouldn't this be letting the XML modulestore deal w/ converting the references?