Work-in-progress making valgrind love us.