More tweaks for C++ support. Still doesn't seem to break anything:-)
3 files changed