Refactor regs for XCHG