Make valgrind happy.
Make valgrind even happier.