Better fix for container memory leak. Now parses valgrind in threaded
and non-threaded mode.