(mostly) done 6.12

There are a few lemmas about nats that need proving, but those are
always so painful.