Wip copy cleanups

Clean up some code cleanliness issues with the new object copy stuff.