[TASK] Further cleanups in logic of paste/move operations