Partially revert 'Revert "Address integer overflows reported by a cod…

…e analyser"'

This partially reverts commit dec663c.

Something went very wrong while reverting, for some reason the doc file
got changed into an HTML file!