[tz] [PROPOSED 6/6] Fix remaining Naveed8951-reported overflows