Merge "Fix a TODO; we've had SOCK_CLOEXEC for a while now."