Improvements to the preprocessor.