Avoid extra cast()s after CStr::as_ptr()
#129332
+26
−27
Merged