rearrange functions to show similarity
Unify unwind_block and unwind_except_handler

The latter is a special case of the former.