Clean up Copy impls a bit