The parser will be going away at some point in the future, but we will still need the fixup step. And the fixup step is really more of a preliminary step for the generator anyway.