Keeping style of if-test consistent within package

Initial focus was to replace instances of if(! ...) with if(not ...),
but also made the general style of if-test consistent across the package.


Former-commit-id: 5e1bbddc