Fix the broken factory coverage system again.  Two, count them, two more procedure rewrites.
Merge branch 'ncn-devel' into merge-from-standard