Complete work on getting nested finally block dedup working