Eliminated valgrind timeouts.