Explicit preserve logic is no longer needed...