Leave in, but surround with #ifdef DEBUG_XMP_WRITE?