Fixed up the inclusion of xtrace metadata in the shuffle header