Well, sure, but isn't this outside the scope of this pull request? After fixing SI-5464, I planned to remove resetAllAttrs, but for now it looks a bit premature.

I suggest we factor out the splicing logic into a function, so that we can easily switch the implementations.