As an experiment to see if we can make things simpler, we could try to force serialization in all cases and measure the performance impact. It's likely that the performance will decrease, but it will be interesting to know how much exactly.