Refactored how tunnel port number is set.