Tidy up a bit now that we're using the MemoryManager interface.