Revert "Um, finish reordering the parser struct"