Fix analysis problems caused by Persistent move.