Merge "Slight change to the unwinder API."