Fix CvlMappingVariabilityChoice project grammar generation