Are code points the correct thing to count here? There are combining characters, there are double-width characters. I think that the CJK number tests pass for the wrong reason -- the width of characters is counted as 1, not as 2, as it would be displayed on the terminal. http://llvm-reviews.chandlerc.com/D918