Multicast socket refactoring (continue...)