Also fixed some difficult memory leaks that became apparent
in this task.