Local var renaming, pass #2