Update the xqueue as well to use the edp convention.