Fix for `is True` and `is None` instead of `==`