Merge "Replace a few more logical operators"