More unixsocket refactoring