Refactor some methods into 'CppTokenCursor', use them