Work on correcting equality semantics from ...

... original C++ transliteration
Trying to correct line ending issues...