[PATCH 0/2] Cleanups to listening socket init functions