Long debugging, minor change. Fixed additional renaming bug for the case
int x;
if (foo()) {
   x = 5;
} and x has to be renamed. Only renaming of renamed ids is still buggy in one case. Working to fix it.