Fix CPPLISTING and a couple of < and > in C++ code