More code cleanup, begin work on nested finally block handling