Support 6-digit codepoints, too