Renderer2: C conversion cleanup