Replace some more != with not_eq