Make _⊕_ more coherent with _⊝_
Fixup old comments