csrf-fix: Redo parsers