Issue #15989: Fixed some scarcely probable integer overflows.

It is very unlikely that they can occur in real code for now.