Well, there's a third option: redo register allocations for all bytecode instructions. That requires quite a bit of data flow analysis. This would be the ideal solution, but I'm going to pass on that as this "christmas project" has already got well out of hand.
