Replace a few more logical operators