Hopefully better handling of C++ targets