Better C++ recognition