The TCP_NODELAY was incorporated upstream (different implementation) and socket shutdown is now supported as well.