Fix typos/weird function names
Cleanup the last bits of non-talloc socket destruction