Code review tweaks for InsecureSkipVerify support

@myleshorton Some suggested changes to your changes
We want to modify the copy, not the original