Preprocessor tweaks.