Partial copy/move cleanup.