Make wording about surrogates consistent with Unicode terminology
Make data structures in abc::text::estimate_transcoded_size() more secure