Fixup socket output, use a single list.