gir parser refinement