[PATCH 2/9] remove xsocket*() wrappers