Switched a number of nsfdata CD structs to the new layout scheme