Fix up the lonely C++ example, and other cleanup

[linas]

On the way to fixing up the example, I discovered other things to cleanup.