Minor fixes to #preprocessor directives.