Replace conservative overflow check with int limit

Replace conservative overflow check with int limit #2469