Update ToUnstructured to handle already unstructured case

Update ToUnstructured to handle already unstructured case #2085