Small guard around unnecessary moves and prototype (commented out) code for updates.