Some cleanup in XOR instructions