Added evaluation of variables to preprocessor