Preprocessor PCREs improved.

The end goal remains elusively at a remove.