Resolve uninterned-comparison errors
65 files changed