Merge "Fix addition/overflow checks."