Improve preprocessor.