Merge "Make functions match definitions in Preprocessor interface"