Small cleanup so that TCP & UDP source has consistent structure.