Continuing the refactoring, esp. regarding pan-machine sockets