Correct bad renaming of local vars in conditional test