Simplification with a new #define. Also one test was inverted.