Simplify dispose for forcible dispose/early end cases