Merge "Simplify boolean expressions"