Merge CmpNat and CmpSymbol in 7.8