Revert last commit in two cases - don't compare two char pointers

Compare the string contents instead. The new old way might not be
optimal, but this works for now.