This should be fixed with V1. I dont think there is a need for V2 at this time. I couldnot follow the changes behind the addendsTableIndex ? is this part of a different cleanup ? http://llvm-reviews.chandlerc.com/D2217