Now using temporary surrogates during move operation.