Agreed -- the new code looks right to me.