As far as I'm aware you don't need this change in this commit - drop Move and just use Swap as it is now.