Tweaks for more obvious memory leak.