Eliminate more memory leaks.