Switch to PCRE regexps