Introducing if/then/else, removing preprocessor
Removing preprocessor