Preprocessor PCREs improved.

When "nearly there" is not nearly enough.