Cpp compiles again. TS scanner much faster without dump.