Updates to preprocessor.