Switching to boostless preprocessor