Tweak of [3051546]: avoid const cast-away