Preprocessor: Better fix for hangs. And added proper unit test.