followup: fix bad merge in ExpandArithWithOverflow