Multibyte character fixes for PCRE and such forthcoming