[TASK] Fix CGL violations against InlineControlStructure