Fix a remove over move xform issue
Handle in-place swap move-over-move case