I have a slightly parallel thread over in v8 but maybe moving this might make sense since cfi isn't 350 specific.