Add support for XCHG in forward simulation. Bug fix.