More minor fixes to vnode setup/teardown handling. I think the
utlimate solution to this whole problem is to change the experiment state so that we can distinguish between real swapout and swapout caused by swapmod/retry/error. Or, we need to add more intermediate allocstates for the nodes. Not sure yet.