More work for C++ mode: