More fixes on the parser conflict resolution