Refactoring, prep work for incremental garbage collection.
Signed-off-by: NKent Overstreet <kmo@daterainc.com>