Simplify preprocessor signature
Lint ALL the things