MFC r297360: sh: Fix use-after-free if a trap replaces itself.

The mergeinfo for this commit was accidentally added to the previous commit.