Use pairmove2() instead of foo->vps = bar->vps;bar->vps = NULL;

There are probably other instances of this in the code