Merge "Code cleanups and simplifications to SpecialMergeHistory"