Moved AddHeapFroms and RemoveHeapFroms to EmbeddedObject and made them non-virtual.