Fix multicast join/leave per @normanmaurer's changes