Merge "Refactor CompareResult<> class and its call sites"