Better handling of join points in spill cleaner