Please see my comment below. I think we'll rework and cleanup the overall parser to be more modular.