Resolve uninterned-comparison errors
7 files changed