#35 refactor OnHeapValueHolder hierarchy