Small refactoring
Support for 'not'-based conditions.
More 'not' cases supported.