Preprocessor PCREs improved.

A minor wiggling there; a nagging juggle there.