Adjusted some negation handling.