Fix Nbr.compare
Allow cflow of vars that are KAPPA_INSTANCE
Restore check that things are only defined once