Improving preprocessor wording & location
Cleaning up the preprocessor option implementation

To be inline with the implementation of the template language option.