Preprocessor improved.