Merge "Fix several ineffective integer overflow checks"