Preprocessor performance improvements

Reclaim 0.4 seconds from the preprocessor.