userdiff: have 'cpp' hunk header pattern catch more C++ anchor points