xmi_aux code cleanup