Fix more spurious overflows detected by Rocco Romeo.