Fixing formatting so that we're faithfully passing on port information.