As #567 never really made it into production, let's make whatever improvements to Cyrillic that I can manage