A few cleanups for 2.13

A few cleanups as a result of adding filter rules, mainly the fact that we don't need to conditionally depend on regex-pcre any more.