Change option to `preprocessor` and cleanup code