Merge "SymbolComparator operator() is missing const"