In my last PPH change, I eliminated the redundancy in the preprocessor