Arg, the (now useless) const_cast was still present in test code.