PERF: Rewrite DoAddI() to avoid generating explicit check for overflow.

Revamp all the Add/AddP() macros so that they are consistent.