Removed some more unnecessary const_casts