[g3dvl] handle different mc types more similary