Updated bool expr code gen