Rewritten to avoid cast that drops const qualification.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14647 a5019735-40e9-0310-863c-91ae7b9d1cf9