Making golint happy, removing a smidge more of the -copy=true bits