More overflow checking fixup.