Preprocessor PCREs improved.

FIXME comments have been unceremoniously shuffled about with great aplomb.