More PCRE cleanup.