Another rework of nsfdata for efficiency and better real-world use