Minor fixes in preprocessor tree building