Minor refactoring; on laptop, client stops receiving at 28998 packets every time.