Agreed about the Unicode split, which we don't already have! I'll have to add that as a separate patch.