Bug #2285: redo parsers