Remove usages of the <-> operator