Redo == and != where necessary.