C++ MWC64 initial implementation. Tidy up of other parts of C++ code.