Suppress upgrade for connect command; tidy comments.