Some valgrind cleanups.