[mcs] Add better type conversion to unary mutators. Fixes #16578