Some extra cleanups that make valgrind output more readable