Trivial changes to pythonify boolean expressions and avoid pep8 error E712 "comparison to True should ..."