This one is also quite expensive.Though it only happens when redelivery triggers (should be rare) so it might makes sense to pay the price here for optimizations for the other cases. WDYT?