Auto-Fix for remove redundant assignment have issues in some cases (Part II) fixes