Fixed: More quality time spent with Valgrind.