Fix a bunch of problems with the preprocessor.