More work on garbage collection.