Updated for use with preprocessor-tools > 1.