Tweaks per Valgrind.