Merge "Small behavioral changes to the unwinder."