Substitute even more != and ==

I will split this into smaller units tomorrow.