When renaming a variable to _, also use var.
#5712
+277
−42
Merged