More improvements to move.h