James C - added invariant synonyms, invariant subtypes (finv and ximv) but have not made invariant focusing work yet
James C - invariants now treat focus properly