Properly implement add/sub overflow logic