Eliminate boolean short-cirtuits effects