What you are suggesting is to use V2 only if references won't fit in V1 (don't mix V1 and V2 in one file), right? Or, did you mean that removing V1 support from Reader/Writer and use V2 even if it fits in V1? http://llvm-reviews.chandlerc.com/D2217