Furthur work to move more state off heap.