Move xid printing option from -x to -w