Finished adapting Parser and generated objects. Still haven't tested.