NNN-wire changes

These are part of the serialization changes. The nnnsim.{cc,h} are still
missing.