Added special case for evaluation of "&&" and "||"