Cleanup
Simplify Preprocessor API