Improve r172468: const_cast is not needed here