Get rid of all mention of XModuleDescriptor.