Currently, it doesn't invoke the callback but continues to unwind

Also while at it - simplify the code a bit
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>