Improve keyword pattern for C++