Make overflow calculations more straightforward