Merging it, given that fixup needs to be evaluated after suspending the transaction, it is not much that we can reuse now. In the near future, I will think of making a wrapper with two arguments for the parameters that can come either as fixup param or str*.