Only set the port number in one place.

Also moved a comment next to what it's commenting on.