Minor tweaks, to allow some (out-of-tree, until successful) tinkering

with C++.