Added short-circuit operators generation