Following svn r13758 (bug 328711), some further similar fixes, 


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