Allow outputs to merge even if they're from the same transaction as the ...

...staked output.