Fix COMPACT_NFDATA closure size, more CNF sanity checking