fix a few sloppy conditionals caught by new test in CmmLint