Merge pull request #12248 from Dentomologist/cheatsearch_use_std_comparison_functions CheatSearch: Use std comparison function objects