Fix boolean simplifier