Tweaked invariants for work on mesh.c

And work on mesh.c, but it doesn't verify now.