Fix cleaning of != and ~=