More hacking on the finally block dedup code