This patch does 1) fix my build breakage  2) Complete the removal of all symbols which could clash with another parser.