Rename the ConstS::val field as kind.
#97935
+173
−169
Merged