Fixes for call site finally generation before non-local returns