Minor clean up on ssh tunnels

(addressing glasser's comments on 5c3b769)