Not part of this pull request, but nfy should be moved before sock - then the structure would be smaller in 64bit (24 v 32bytes)