Remove some occurrences of obsolete operators