Code cleanup around ABNORMAL_EXIT