Fixing preprocessor var discovery