More tweaks to changes to TableSpec_cnf internals

In progress...