Replace mk_const with Const::new_x methods
#113325
Merged
mk_const with Const::new_x methods
#113325