Update P and BR stripping code to play nicer with other plugins.