Visitor refactor fix

Follow up on "Fix minor warning issues #3598". Refactoring in 0215b46 missed shadowing local variable name e1 and e2 for CmpExp and EqualExp vistor methods.