@bill-myers this seems to be modifying two places at once (although it does look like it may possibly be able to be rearranged to avoid this, maybe).