Thanks to Dan's hint about frame_unwind_address_in_block, the following 
fixes the unwinding problem I saw. OK?

randolph