Clean up cm_arrays.xml (again)