Bug Fix : changed defset to CommonIfNodes.
Removed check for not expression in case of short circuit or