Preprocessor PCREs improved.

Incremental improvement is still incremental.