minor improvement of preprocessor