Merge "Fix self assignment bugs."