I committed the "we don't need no stinkin' C++ compiler" changes this
morning after a bunch of testing, but I totally neglected to test the
case *with* a C++ compiler. :-(
So the trunk is borked at the moment; I'm working on a fix...