Code review tweaks for InsecureSkipVerify support

@myleshorton Some suggested changes to your changes
Same here